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

Commit e025d386 authored by Jyri Sarha's avatar Jyri Sarha Committed by Tomi Valkeinen
Browse files

Revert "drm: omapdrm: Let the DRM core skip plane commit on inactive CRTCs" 



This reverts commit dadf4659.

If planes are not disabled when the they are not on any crtc anymore
they will remain active and may show as "ghosts" when the crtc they
were last on is active again.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 13f62f54

drivers/gpu/drm/omapdrm/omap_crtc.c

+1 −7
Original line number Diff line number Diff line
@@ -410,13 +410,7 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc, 
		dispc_mgr_set_gamma(omap_crtc->channel, lut, length);

	}



	/*

	 * Only flush the CRTC if it is currently enabled. CRTCs that require a

	 * mode set are disabled prior plane updates and enabled afterwards.

	 * They are thus not active (regardless of what their CRTC core state

	 * reports) and the DRM core could thus call this function even though

	 * the CRTC is currently disabled. Do nothing in that case.

	 */

	/* Only flush the CRTC if it is currently enabled. */

	if (!omap_crtc->enabled)

		return;

drivers/gpu/drm/omapdrm/omap_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ static void omap_atomic_complete(struct omap_atomic_state_commit *commit) 
	dispc_runtime_get();



	drm_atomic_helper_commit_modeset_disables(dev, old_state);

	drm_atomic_helper_commit_planes(dev, old_state,

					DRM_PLANE_COMMIT_ACTIVE_ONLY);

	drm_atomic_helper_commit_planes(dev, old_state, 0);

	drm_atomic_helper_commit_modeset_enables(dev, old_state);



	omap_atomic_wait_for_completion(dev, old_state);