Commit f7e0b3c2 authored by Vinod Polimera's avatar Vinod Polimera Committed by Dmitry Baryshkov
Browse files

drm/msm/disp/dpu: update dpu_enc crtc state on crtc enable/disable during self refresh 



Populate the enocder software structure to reflect the updated
crtc appropriately during crtc enable/disable for a new commit
while taking care of the self refresh transitions when crtc
disable is triggered from the drm self refresh library.

Signed-off-by: default avatarVinod Polimera <quic_vpolimer@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/524742/
Link: https://lore.kernel.org/r/1677774797-31063-14-git-send-email-quic_vpolimer@quicinc.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 11226978

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+25 −4
Original line number Diff line number Diff line
@@ -1022,8 +1022,17 @@ static void dpu_crtc_disable(struct drm_crtc *crtc, 


	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);



	if (old_crtc_state->self_refresh_active)

	/* If disable is triggered while in self refresh mode,

	 * reset the encoder software state so that in enable

	 * it won't trigger a warn while assigning crtc.

	 */

	if (old_crtc_state->self_refresh_active) {

		drm_for_each_encoder_mask(encoder, crtc->dev,

					old_crtc_state->encoder_mask) {

			dpu_encoder_assign_crtc(encoder, NULL);

		}

		return;

	}



	/* Disable/save vblank irq handling */

	drm_crtc_vblank_off(crtc);
@@ -1036,6 +1045,13 @@ static void dpu_crtc_disable(struct drm_crtc *crtc, 
		 */

		if (dpu_encoder_get_intf_mode(encoder) == INTF_MODE_VIDEO)

			release_bandwidth = true;



		/*

		 * If disable is triggered during psr active(e.g: screen dim in PSR),

		 * we will need encoder->crtc connection to process the device sleep &

		 * preserve it during psr sequence.

		 */

		if (!crtc->state->self_refresh_active)

			dpu_encoder_assign_crtc(encoder, NULL);

	}
@@ -1084,6 +1100,9 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, 
	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);

	struct drm_encoder *encoder;

	bool request_bandwidth = false;

	struct drm_crtc_state *old_crtc_state;



	old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);



	pm_runtime_get_sync(crtc->dev->dev);
@@ -1106,8 +1125,10 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, 
	trace_dpu_crtc_enable(DRMID(crtc), true, dpu_crtc);

	dpu_crtc->enabled = true;



	if (!old_crtc_state->self_refresh_active) {

		drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)

			dpu_encoder_assign_crtc(encoder, crtc);

	}



	/* Enable/restore vblank irq handling */

	drm_crtc_vblank_on(crtc);