Skip to content

Commit 03c0c3c

Browse files
lumagAbhinav Kumar
authored andcommitted
drm/msm/dpu: correct sm8250 and sm8350 scaler
QSEED4 is a newer variant of QSEED3LITE, which should be used on sm8250 and sm8350. Fix the DPU caps structure and used feature masks. Fixes: d21fc5d ("drm/msm/dpu1: add support for qseed3lite used on sm8250") Fixes: 0e91bcb ("drm/msm/dpu: Add SM8350 to hw catalog") Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/522229/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abhinav Kumar <[email protected]>
1 parent c7da17b commit 03c0c3c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ static const struct dpu_caps sc8280xp_dpu_caps = {
416416
static const struct dpu_caps sm8250_dpu_caps = {
417417
.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
418418
.max_mixer_blendstages = 0xb,
419-
.qseed_type = DPU_SSPP_SCALER_QSEED3LITE,
419+
.qseed_type = DPU_SSPP_SCALER_QSEED4,
420420
.smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */
421421
.ubwc_version = DPU_HW_UBWC_VER_40,
422422
.has_src_split = true,
@@ -430,7 +430,7 @@ static const struct dpu_caps sm8250_dpu_caps = {
430430
static const struct dpu_caps sm8350_dpu_caps = {
431431
.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
432432
.max_mixer_blendstages = 0xb,
433-
.qseed_type = DPU_SSPP_SCALER_QSEED3LITE,
433+
.qseed_type = DPU_SSPP_SCALER_QSEED4,
434434
.smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */
435435
.ubwc_version = DPU_HW_UBWC_VER_40,
436436
.has_src_split = true,
@@ -1245,22 +1245,22 @@ static const struct dpu_sspp_cfg sm6115_sspp[] = {
12451245
};
12461246

12471247
static const struct dpu_sspp_sub_blks sm8250_vig_sblk_0 =
1248-
_VIG_SBLK("0", 5, DPU_SSPP_SCALER_QSEED3LITE);
1248+
_VIG_SBLK("0", 5, DPU_SSPP_SCALER_QSEED4);
12491249
static const struct dpu_sspp_sub_blks sm8250_vig_sblk_1 =
1250-
_VIG_SBLK("1", 6, DPU_SSPP_SCALER_QSEED3LITE);
1250+
_VIG_SBLK("1", 6, DPU_SSPP_SCALER_QSEED4);
12511251
static const struct dpu_sspp_sub_blks sm8250_vig_sblk_2 =
1252-
_VIG_SBLK("2", 7, DPU_SSPP_SCALER_QSEED3LITE);
1252+
_VIG_SBLK("2", 7, DPU_SSPP_SCALER_QSEED4);
12531253
static const struct dpu_sspp_sub_blks sm8250_vig_sblk_3 =
1254-
_VIG_SBLK("3", 8, DPU_SSPP_SCALER_QSEED3LITE);
1254+
_VIG_SBLK("3", 8, DPU_SSPP_SCALER_QSEED4);
12551255

12561256
static const struct dpu_sspp_cfg sm8250_sspp[] = {
1257-
SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, VIG_SM8250_MASK,
1257+
SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, VIG_SC7180_MASK,
12581258
sm8250_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),
1259-
SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, VIG_SM8250_MASK,
1259+
SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, VIG_SC7180_MASK,
12601260
sm8250_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),
1261-
SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, VIG_SM8250_MASK,
1261+
SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, VIG_SC7180_MASK,
12621262
sm8250_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),
1263-
SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, VIG_SM8250_MASK,
1263+
SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, VIG_SC7180_MASK,
12641264
sm8250_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),
12651265
SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, DMA_SDM845_MASK,
12661266
sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),

0 commit comments

Comments
 (0)