github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/vc4: vec: Switch to DRM-managed encoder initialization

Browse Source 
The current code will call drm_encoder_cleanup() when the device is
unbound. However, by then, there might still be some references held to
that encoder, including by the userspace that might still have the DRM
device open.

Let's switch to a DRM-managed initialization to clean up after ourselves
only once the DRM device has been last closed.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-59-maxime@cerno.tech
This commit is contained in:
Maxime Ripard 2022-07-11 19:39:28 +02:00
parent cd2444a795
commit c62f432f2e
No known key found for this signature in database
GPG Key ID: E3EF0D6F671851C5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/vc4/vc4_vec.c
View File

@ -528,12 +528,18 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
pm_runtime_enable(dev);
drm_simple_encoder_init(drm, &vec->encoder.base, DRM_MODE_ENCODER_TVDAC);
ret = drmm_encoder_init(drm, &vec->encoder.base,
NULL,
DRM_MODE_ENCODER_TVDAC,
NULL);
if (ret)
goto err_put_runtime_pm;
drm_encoder_helper_add(&vec->encoder.base, &vc4_vec_encoder_helper_funcs);
ret = vc4_vec_connector_init(drm, vec);
if (ret)
goto err_destroy_encoder;
goto err_put_runtime_pm;
dev_set_drvdata(dev, vec);
@ -541,8 +547,7 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
return 0;
err_destroy_encoder:
drm_encoder_cleanup(&vec->encoder.base);
err_put_runtime_pm:
pm_runtime_disable(dev);
return ret;
@ -554,7 +559,6 @@ static void vc4_vec_unbind(struct device *dev, struct device *master,
struct vc4_vec *vec = dev_get_drvdata(dev);
drm_connector_cleanup(&vec->connector);
drm_encoder_cleanup(&vec->encoder.base);
pm_runtime_disable(dev);
}