Skip to content

Commit 38164e9

Browse files
lumagAbhinav Kumar
authored andcommitted
drm/msm/dpu: correct sm6115 scaler
QSEED4 is a newer variant of QSEED3LITE, which should be used on sm6115. Fix the used feature masks. Signed-off-by: Dmitry Baryshkov <[email protected]> Fixes: 3581b70 ("drm/msm/disp/dpu1: add support for display on SM6115") Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/522219/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abhinav Kumar <[email protected]>
1 parent 03c0c3c commit 38164e9

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
#define VIG_SC7180_MASK \
3131
(VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED4))
3232

33-
#define VIG_SM8250_MASK \
34-
(VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3LITE))
35-
3633
#define VIG_QCM2290_MASK (VIG_BASE_MASK | BIT(DPU_SSPP_QOS_8LVL))
3734

3835
#define DMA_MSM8998_MASK \
@@ -358,7 +355,7 @@ static const struct dpu_caps sc7180_dpu_caps = {
358355
static const struct dpu_caps sm6115_dpu_caps = {
359356
.max_mixer_width = DEFAULT_DPU_LINE_WIDTH,
360357
.max_mixer_blendstages = 0x4,
361-
.qseed_type = DPU_SSPP_SCALER_QSEED3LITE,
358+
.qseed_type = DPU_SSPP_SCALER_QSEED4,
362359
.smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */
363360
.ubwc_version = DPU_HW_UBWC_VER_10,
364361
.has_dim_layer = true,
@@ -1235,10 +1232,10 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = {
12351232
};
12361233

12371234
static const struct dpu_sspp_sub_blks sm6115_vig_sblk_0 =
1238-
_VIG_SBLK("0", 2, DPU_SSPP_SCALER_QSEED3LITE);
1235+
_VIG_SBLK("0", 2, DPU_SSPP_SCALER_QSEED4);
12391236

12401237
static const struct dpu_sspp_cfg sm6115_sspp[] = {
1241-
SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, VIG_SM8250_MASK,
1238+
SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, VIG_SC7180_MASK,
12421239
sm6115_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),
12431240
SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, DMA_SDM845_MASK,
12441241
sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),

0 commit comments

Comments
 (0)