Skip to content

Commit f1b4dfe

Browse files
lumagpull[bot]
authored andcommitted
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: 3581b70 ("drm/msm/disp/dpu1: add support for display on SM6115") Fixes: 5334087 ("drm/msm: add support for QCM2290 MDSS") Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/522212/ Link: https://lore.kernel.org/r/[email protected] [[email protected]: fix minor typo in commit message] Signed-off-by: Abhinav Kumar <[email protected]>
1 parent f30ea14 commit f1b4dfe

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static const struct dpu_caps msm8998_dpu_caps = {
318318
};
319319

320320
static const struct dpu_caps qcm2290_dpu_caps = {
321-
.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
321+
.max_mixer_width = DEFAULT_DPU_LINE_WIDTH,
322322
.max_mixer_blendstages = 0x4,
323323
.smart_dma_rev = DPU_SSPP_SMART_DMA_V2,
324324
.has_dim_layer = true,
@@ -356,7 +356,7 @@ static const struct dpu_caps sc7180_dpu_caps = {
356356
};
357357

358358
static const struct dpu_caps sm6115_dpu_caps = {
359-
.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
359+
.max_mixer_width = DEFAULT_DPU_LINE_WIDTH,
360360
.max_mixer_blendstages = 0x4,
361361
.qseed_type = DPU_SSPP_SCALER_QSEED3LITE,
362362
.smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */
@@ -1520,7 +1520,7 @@ static const struct dpu_lm_cfg sc7280_lm[] = {
15201520
/* QCM2290 */
15211521

15221522
static const struct dpu_lm_sub_blks qcm2290_lm_sblk = {
1523-
.maxwidth = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
1523+
.maxwidth = DEFAULT_DPU_LINE_WIDTH,
15241524
.maxblendstages = 4, /* excluding base layer */
15251525
.blendstage_base = { /* offsets relative to mixer base */
15261526
0x20, 0x38, 0x50, 0x68

0 commit comments

Comments
 (0)