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

Commit 5552aad3 authored by Fabien Dessenne's avatar Fabien Dessenne Committed by Vincent Abriou
Browse files

drm/sti: fix atomic_disable check 



When a drm_plane is being disabled, its ->crtc member is set to NULL
before the .atomic_disable() func is called.
To get the crtc of the plane, read old_state->crtc instead of
drm_plane->crtc

Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
parent 00b517e5

drivers/gpu/drm/sti/sti_cursor.c

+3 −3
Original line number Diff line number Diff line
@@ -309,15 +309,15 @@ static void sti_cursor_atomic_disable(struct drm_plane *drm_plane, 
{

	struct sti_plane *plane = to_sti_plane(drm_plane);



	if (!drm_plane->crtc) {

	if (!oldstate->crtc) {

		DRM_DEBUG_DRIVER("drm plane:%d not enabled\n",

				 drm_plane->base.id);

		return;

	}



	DRM_DEBUG_DRIVER("CRTC:%d (%s) drm plane:%d (%s)\n",

			 drm_plane->crtc->base.id,

			 sti_mixer_to_str(to_sti_mixer(drm_plane->crtc)),

			 oldstate->crtc->base.id,

			 sti_mixer_to_str(to_sti_mixer(oldstate->crtc)),

			 drm_plane->base.id, sti_plane_to_str(plane));



	plane->status = STI_PLANE_DISABLING;

drivers/gpu/drm/sti/sti_gdp.c

+3 −3
Original line number Diff line number Diff line
@@ -846,15 +846,15 @@ static void sti_gdp_atomic_disable(struct drm_plane *drm_plane, 
{

	struct sti_plane *plane = to_sti_plane(drm_plane);



	if (!drm_plane->crtc) {

	if (!oldstate->crtc) {

		DRM_DEBUG_DRIVER("drm plane:%d not enabled\n",

				 drm_plane->base.id);

		return;

	}



	DRM_DEBUG_DRIVER("CRTC:%d (%s) drm plane:%d (%s)\n",

			 drm_plane->crtc->base.id,

			 sti_mixer_to_str(to_sti_mixer(drm_plane->crtc)),

			 oldstate->crtc->base.id,

			 sti_mixer_to_str(to_sti_mixer(oldstate->crtc)),

			 drm_plane->base.id, sti_plane_to_str(plane));



	plane->status = STI_PLANE_DISABLING;

drivers/gpu/drm/sti/sti_hqvdp.c

+3 −3
Original line number Diff line number Diff line
@@ -1215,15 +1215,15 @@ static void sti_hqvdp_atomic_disable(struct drm_plane *drm_plane, 
{

	struct sti_plane *plane = to_sti_plane(drm_plane);



	if (!drm_plane->crtc) {

	if (!oldstate->crtc) {

		DRM_DEBUG_DRIVER("drm plane:%d not enabled\n",

				 drm_plane->base.id);

		return;

	}



	DRM_DEBUG_DRIVER("CRTC:%d (%s) drm plane:%d (%s)\n",

			 drm_plane->crtc->base.id,

			 sti_mixer_to_str(to_sti_mixer(drm_plane->crtc)),

			 oldstate->crtc->base.id,

			 sti_mixer_to_str(to_sti_mixer(oldstate->crtc)),

			 drm_plane->base.id, sti_plane_to_str(plane));



	plane->status = STI_PLANE_DISABLING;