Unverified Commit e46e5330 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201029190104.2181730-2-maxime@cerno.tech
parent 1c80be48
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -281,7 +281,9 @@ static int vc4_drm_bind(struct device *dev)
	if (ret)
		goto dev_put;

	drm_mode_config_init(drm);
	ret = drmm_mode_config_init(drm);
	if (ret)
		goto dev_put;

	vc4_gem_init(drm);

@@ -314,7 +316,6 @@ unbind_all:
	component_unbind_all(dev, drm);
gem_destroy:
	vc4_gem_destroy(drm);
	drm_mode_config_cleanup(drm);
dev_put:
	drm_dev_put(drm);
	return ret;
@@ -329,8 +330,6 @@ static void vc4_drm_unbind(struct device *dev)

	drm_atomic_helper_shutdown(drm);

	drm_mode_config_cleanup(drm);

	drm_atomic_private_obj_fini(&vc4->load_tracker);
	drm_atomic_private_obj_fini(&vc4->ctm_manager);