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

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>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-34-maxime@cerno.tech
This commit is contained in:
Maxime Ripard 2022-07-11 19:39:03 +02:00
parent 73b68b28a9
commit 6f0ca506c3
No known key found for this signature in database
GPG key ID: E3EF0D6F671851C5

View file

@ -1687,7 +1687,13 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
if (ret)
return ret;
drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_DSI);
ret = drmm_encoder_init(drm, encoder,
NULL,
DRM_MODE_ENCODER_DSI,
NULL);
if (ret)
return ret;
drm_encoder_helper_add(encoder, &vc4_dsi_encoder_helper_funcs);
ret = drm_bridge_attach(encoder, dsi->bridge, NULL, 0);
@ -1720,7 +1726,6 @@ static void vc4_dsi_unbind(struct device *dev, struct device *master,
* normally.
*/
list_splice_init(&dsi->bridge_chain, &encoder->bridge_chain);
drm_encoder_cleanup(encoder);
}
static const struct component_ops vc4_dsi_ops = {