Check whenever mode_config was actually properly initialized before trying to clean it up. Signed-off-by: Gerd Hoffmann <kraxel at redhat.com> --- drivers/gpu/drm/bochs/bochs_kms.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index cc93ff74fbd8..3a755c911342 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -164,6 +164,9 @@ int bochs_kms_init(struct bochs_device *bochs) void bochs_kms_fini(struct bochs_device *bochs) { + if (!bochs->dev->mode_config.num_connector) + return; + drm_atomic_helper_shutdown(bochs->dev); drm_mode_config_cleanup(bochs->dev); } -- 2.18.1
On Fri, Feb 07, 2020 at 01:43:48PM +0100, Gerd Hoffmann wrote:> Check whenever mode_config was actually properly > initialized before trying to clean it up. > > Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch> Really need to get managed drm cleanup going ... -Daniel> --- > drivers/gpu/drm/bochs/bochs_kms.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c > index cc93ff74fbd8..3a755c911342 100644 > --- a/drivers/gpu/drm/bochs/bochs_kms.c > +++ b/drivers/gpu/drm/bochs/bochs_kms.c > @@ -164,6 +164,9 @@ int bochs_kms_init(struct bochs_device *bochs) > > void bochs_kms_fini(struct bochs_device *bochs) > { > + if (!bochs->dev->mode_config.num_connector) > + return; > + > drm_atomic_helper_shutdown(bochs->dev); > drm_mode_config_cleanup(bochs->dev); > } > -- > 2.18.1 >-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Apparently Analagous Threads
- [PATCH 28/51] drm/bochs: Drop explicit drm_mode_config_cleanup
- [PATCH 2/3] drm/bochs: add missing drm_atomic_helper_shutdown() call.
- [PATCH 29/52] drm/bochs: Drop explicit drm_mode_config_cleanup
- [PATCH 1/2] drm/bochs: drop mode_config_initialized
- [PATCH v4] drm/bochs: add drm_driver.release callback.