Skip to content

Commit e46e533

Browse files
committed
drm/vc4: drv: Use managed drm_mode_config_init
Using drmm_mode_config_init instead of drm_mode_config_init allows us to cleanup a bit the error path. Signed-off-by: Maxime Ripard <maxime@cerno.tech> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20201029190104.2181730-2-maxime@cerno.tech
1 parent 1c80be4 commit e46e533

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/gpu/drm/vc4/vc4_drv.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,9 @@ static int vc4_drm_bind(struct device *dev)
281281
if (ret)
282282
goto dev_put;
283283

284-
drm_mode_config_init(drm);
284+
ret = drmm_mode_config_init(drm);
285+
if (ret)
286+
goto dev_put;
285287

286288
vc4_gem_init(drm);
287289

@@ -314,7 +316,6 @@ static int vc4_drm_bind(struct device *dev)
314316
component_unbind_all(dev, drm);
315317
gem_destroy:
316318
vc4_gem_destroy(drm);
317-
drm_mode_config_cleanup(drm);
318319
dev_put:
319320
drm_dev_put(drm);
320321
return ret;
@@ -329,8 +330,6 @@ static void vc4_drm_unbind(struct device *dev)
329330

330331
drm_atomic_helper_shutdown(drm);
331332

332-
drm_mode_config_cleanup(drm);
333-
334333
drm_atomic_private_obj_fini(&vc4->load_tracker);
335334
drm_atomic_private_obj_fini(&vc4->ctm_manager);
336335

0 commit comments

Comments
 (0)