Commit 4ba5a4ad authored by Marijn Suijten's avatar Marijn Suijten Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: Remove num_enc from topology struct in favour of num_dsc 



Downstream calls this num_enc yet the DSC patches introduced a new
num_dsc struct member, leaving num_enc effectively unused.

Fixes: 7e9cc175 ("drm/msm/disp/dpu1: Add support for DSC in topology")
Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/515688/
Link: https://lore.kernel.org/r/20221221231943.1961117-7-marijn.suijten@somainline.org


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

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

+4 −5
Original line number Diff line number Diff line
@@ -579,19 +579,18 @@ static struct msm_display_topology dpu_encoder_get_topology( 
			topology.num_dspp = topology.num_lm;

	}



	topology.num_enc = 0;

	topology.num_intf = intf_count;



	if (dpu_enc->dsc) {

		/* In case of Display Stream Compression (DSC), we would use

		 * 2 encoders, 2 layer mixers and 1 interface

		/*

		 * In case of Display Stream Compression (DSC), we would use

		 * 2 DSC encoders, 2 layer mixers and 1 interface

		 * this is power optimal and can drive up to (including) 4k

		 * screens

		 */

		topology.num_enc = 2;

		topology.num_dsc = 2;

		topology.num_intf = 1;

		topology.num_lm = 2;

		topology.num_intf = 1;

	}



	return topology;

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

+2 −2
Original line number Diff line number Diff line
@@ -548,8 +548,8 @@ static int _dpu_rm_populate_requirements( 
{

	reqs->topology = req_topology;



	DRM_DEBUG_KMS("num_lm: %d num_enc: %d num_intf: %d\n",

		      reqs->topology.num_lm, reqs->topology.num_enc,

	DRM_DEBUG_KMS("num_lm: %d num_dsc: %d num_intf: %d\n",

		      reqs->topology.num_lm, reqs->topology.num_dsc,

		      reqs->topology.num_intf);



	return 0;

drivers/gpu/drm/msm/msm_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -83,14 +83,12 @@ enum msm_event_wait { 
/**

 * struct msm_display_topology - defines a display topology pipeline

 * @num_lm:       number of layer mixers used

 * @num_enc:      number of compression encoder blocks used

 * @num_intf:     number of interfaces the panel is mounted on

 * @num_dspp:     number of dspp blocks used

 * @num_dsc:      number of Display Stream Compression (DSC) blocks used

 */

struct msm_display_topology {

	u32 num_lm;

	u32 num_enc;

	u32 num_intf;

	u32 num_dspp;

	u32 num_dsc;