Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109c4d18 authored by Ayan Kumar Halder's avatar Ayan Kumar Halder Committed by Liviu Dudau
Browse files

drm/arm/malidp: Ensure that the crtcs are shutdown before removing any encoder/connector 



One needs to ensure that the crtcs are shutdown so that the
drm_crtc_state->connector_mask reflects that no connectors
are currently active. Further, it reduces the reference
count for each connector. This ensures that the connectors
and encoders can be cleanly removed either when _unbind
is called for the corresponding drivers or by
drm_mode_config_cleanup().
We need drm_atomic_helper_shutdown() to be called before
component_unbind_all() otherwise the connectors attached to the
component device will have the wrong reference count value and will not
be cleanly removed.

Signed-off-by: default avatarAyan Kumar Halder <ayan.halder@arm.com>
Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
parent ce397d21

drivers/gpu/drm/arm/malidp_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ static int malidp_init(struct drm_device *drm) 


static void malidp_fini(struct drm_device *drm)

{

	drm_atomic_helper_shutdown(drm);

	drm_mode_config_cleanup(drm);

}
@@ -646,6 +645,7 @@ static int malidp_bind(struct device *dev) 
	malidp_de_irq_fini(drm);

	drm->irq_enabled = false;

irq_init_fail:

	drm_atomic_helper_shutdown(drm);

	component_unbind_all(dev, drm);

bind_fail:

	of_node_put(malidp->crtc.port);
@@ -681,6 +681,7 @@ static void malidp_unbind(struct device *dev) 
	malidp_se_irq_fini(drm);

	malidp_de_irq_fini(drm);

	drm->irq_enabled = false;

	drm_atomic_helper_shutdown(drm);

	component_unbind_all(dev, drm);

	of_node_put(malidp->crtc.port);

	malidp->crtc.port = NULL;