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

Commit 20f40235 authored by Prabhanjan Kandula's avatar Prabhanjan Kandula
Browse files

drm/msm/sde: back off plane state changes in continuous splash 



In current SDE driver, during continuous splash, drm plane state is
updated with crtc object of the corresponding display. Such changes
to drm plane state with in the driver is causing commit failures in
legacy commit path and pm resume case. This change avoids modifying
drm plane state directly in SDE driver.

Change-Id: Ie905c60ff0e6e547528371ef47f3f81f9cd95e29
Signed-off-by: default avatarPrabhanjan Kandula <pkandula@codeaurora.org>
parent 323e1dab

drivers/gpu/drm/msm/sde/sde_kms.c

+0 −28
Original line number Original line Diff line number Diff line
@@ -1052,9 +1052,6 @@ static void _sde_kms_release_splash_resource(struct sde_kms *sde_kms, 
{

{

	struct msm_drm_private *priv;

	struct msm_drm_private *priv;

	struct sde_splash_display *splash_display;

	struct sde_splash_display *splash_display;

	struct drm_plane *plane;

	enum sde_sspp plane_id;

	bool is_virtual;

	int i;

	int i;





	if (!sde_kms || !crtc)

	if (!sde_kms || !crtc)
@@ -1077,29 +1074,6 @@ static void _sde_kms_release_splash_resource(struct sde_kms *sde_kms, 
	if (i >= MAX_DSI_DISPLAYS)

	if (i >= MAX_DSI_DISPLAYS)

		return;

		return;





	/*

	 * For planes attached in continuous splash, reset the plane state

	 * only if first commit is not using the plane for display.

	 * Valid fb indicates client is using the plane.

	 */

	for (i = 0; i < splash_display->pipe_cnt; i++) {

		drm_for_each_plane(plane, sde_kms->dev) {

			plane_id = sde_plane_pipe(plane);

			is_virtual = is_sde_plane_virtual(plane);



			if ((plane_id != splash_display->pipes[i].sspp) ||

				(splash_display->pipes[i].is_virtual !=

					 is_virtual) || (plane->state->fb))

				continue;



			plane->crtc = NULL;

			plane->state->crtc = NULL;

			SDE_DEBUG("reset crtc plane:%d rect:%d\n",

					plane_id, is_virtual);

			break;

		}

	}



	_sde_kms_splash_mem_put(sde_kms, splash_display->splash);

	_sde_kms_splash_mem_put(sde_kms, splash_display->splash);





	if (splash_display->cont_splash_enabled) {

	if (splash_display->cont_splash_enabled) {
@@ -2465,8 +2439,6 @@ static int _sde_kms_update_planes_for_cont_splash(struct sde_kms *sde_kms, 
						plane_id, crtc->base.id);

						plane_id, crtc->base.id);

			}

			}





			plane->crtc = crtc;

			plane->state->crtc = crtc;

			SDE_DEBUG("set crtc:%d for plane:%d rect:%d\n",

			SDE_DEBUG("set crtc:%d for plane:%d rect:%d\n",

					crtc->base.id, plane_id, is_virtual);

					crtc->base.id, plane_id, is_virtual);

		}

		}