Commit da06be8b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Abhinav Kumar
Browse files

drm/msm/dpu: fix sm6115 and qcm2290 mixer width limits 



According to vendor DTS files both sm6115 and qcm2290 should have
max_mixer_width set to 2048 (DEFAULT_DPU_LINE_WIDTH). Correct it.

Fixes: 3581b706 ("drm/msm/disp/dpu1: add support for display on SM6115")
Fixes: 5334087e ("drm/msm: add support for QCM2290 MDSS")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/522212/
Link: https://lore.kernel.org/r/20230211231259.1308718-6-dmitry.baryshkov@linaro.org


[quic_abhinavk@quicinc.com: fix minor typo in commit message]
Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
parent ce6bd00a

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

+3 −3
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static const struct dpu_caps msm8998_dpu_caps = { 
};



static const struct dpu_caps qcm2290_dpu_caps = {

	.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,

	.max_mixer_width = DEFAULT_DPU_LINE_WIDTH,

	.max_mixer_blendstages = 0x4,

	.smart_dma_rev = DPU_SSPP_SMART_DMA_V2,

	.has_dim_layer = true,
@@ -356,7 +356,7 @@ static const struct dpu_caps sc7180_dpu_caps = { 
};



static const struct dpu_caps sm6115_dpu_caps = {

	.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,

	.max_mixer_width = DEFAULT_DPU_LINE_WIDTH,

	.max_mixer_blendstages = 0x4,

	.qseed_type = DPU_SSPP_SCALER_QSEED3LITE,

	.smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */
@@ -1520,7 +1520,7 @@ static const struct dpu_lm_cfg sc7280_lm[] = { 
/* QCM2290 */



static const struct dpu_lm_sub_blks qcm2290_lm_sblk = {

	.maxwidth = DEFAULT_DPU_OUTPUT_LINE_WIDTH,

	.maxwidth = DEFAULT_DPU_LINE_WIDTH,

	.maxblendstages = 4, /* excluding base layer */

	.blendstage_base = { /* offsets relative to mixer base */

		0x20, 0x38, 0x50, 0x68