Commit 8aa22aaa authored by Kalyan Thota's avatar Kalyan Thota Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: add DSPPs into reservation upon a CTM request 



Add DSPP blocks into the topology for reservation, if there
is a CTM request for that composition.

Signed-off-by: default avatarKalyan Thota <quic_kalyant@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Patchwork: https://patchwork.freedesktop.org/patch/522445/
Link: https://lore.kernel.org/r/1676286704-818-3-git-send-email-quic_kalyant@quicinc.com


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

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

+6 −9
Original line number Diff line number Diff line
@@ -545,7 +545,8 @@ bool dpu_encoder_use_dsc_merge(struct drm_encoder *drm_enc) 
static struct msm_display_topology dpu_encoder_get_topology(

			struct dpu_encoder_virt *dpu_enc,

			struct dpu_kms *dpu_kms,

			struct drm_display_mode *mode)

			struct drm_display_mode *mode,

			struct drm_crtc_state *crtc_state)

{

	struct msm_display_topology topology = {0};

	int i, intf_count = 0;
@@ -563,8 +564,7 @@ static struct msm_display_topology dpu_encoder_get_topology( 
	 * 1 LM, 1 INTF

	 * 2 LM, 1 INTF (stream merge to support high resolution interfaces)

	 *

	 * Adding color blocks only to primary interface if available in

	 * sufficient number

	 * Add dspps to the reservation requirements if ctm is requested

	 */

	if (intf_count == 2)

		topology.num_lm = 2;
@@ -573,11 +573,8 @@ static struct msm_display_topology dpu_encoder_get_topology( 
	else

		topology.num_lm = (mode->hdisplay > MAX_HDISPLAY_SPLIT) ? 2 : 1;



	if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {

		if (dpu_kms->catalog->dspp &&

			(dpu_kms->catalog->dspp_count >= topology.num_lm))

	if (crtc_state->ctm)

		topology.num_dspp = topology.num_lm;

	}



	topology.num_intf = intf_count;
@@ -642,7 +639,7 @@ static int dpu_encoder_virt_atomic_check( 
		}

	}



	topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode);

	topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state);



	/* Reserve dynamic resources now. */

	if (!ret) {