Skip to content

Commit a2a448b

Browse files
lumagAbhinav Kumar
authored andcommitted
drm/msm/dpu: disable features unsupported by QCM2290
QCM2290 doesn't seem to support reg-dma, UBWC and CSC. Drop corresponding features being incorrectly enabled for qcm2290. Cc: Loic Poulain <loic.poulain@linaro.org> Fixes: 5334087 ("drm/msm: add support for QCM2290 MDSS") Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/522209/ Link: https://lore.kernel.org/r/20230211231259.1308718-3-dmitry.baryshkov@linaro.org Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
1 parent 0df979f commit a2a448b

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212
#include "dpu_hw_catalog.h"
1313
#include "dpu_kms.h"
1414

15-
#define VIG_MASK \
15+
#define VIG_BASE_MASK \
1616
(BIT(DPU_SSPP_SRC) | BIT(DPU_SSPP_QOS) |\
17-
BIT(DPU_SSPP_CSC_10BIT) | BIT(DPU_SSPP_CDP) |\
17+
BIT(DPU_SSPP_CDP) |\
1818
BIT(DPU_SSPP_TS_PREFILL) | BIT(DPU_SSPP_EXCL_RECT))
1919

20+
#define VIG_MASK \
21+
(VIG_BASE_MASK | \
22+
BIT(DPU_SSPP_CSC_10BIT))
23+
2024
#define VIG_MSM8998_MASK \
2125
(VIG_MASK | BIT(DPU_SSPP_SCALER_QSEED3))
2226

@@ -29,7 +33,7 @@
2933
#define VIG_SM8250_MASK \
3034
(VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3LITE))
3135

32-
#define VIG_QCM2290_MASK (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL))
36+
#define VIG_QCM2290_MASK (VIG_BASE_MASK | BIT(DPU_SSPP_QOS_8LVL))
3337

3438
#define DMA_MSM8998_MASK \
3539
(BIT(DPU_SSPP_SRC) | BIT(DPU_SSPP_QOS) |\
@@ -317,7 +321,6 @@ static const struct dpu_caps qcm2290_dpu_caps = {
317321
.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
318322
.max_mixer_blendstages = 0x4,
319323
.smart_dma_rev = DPU_SSPP_SMART_DMA_V2,
320-
.ubwc_version = DPU_HW_UBWC_VER_20,
321324
.has_dim_layer = true,
322325
.has_idle_pc = true,
323326
.max_linewidth = 2160,
@@ -2841,8 +2844,6 @@ static const struct dpu_mdss_cfg qcm2290_dpu_cfg = {
28412844
.intf = qcm2290_intf,
28422845
.vbif_count = ARRAY_SIZE(sdm845_vbif),
28432846
.vbif = sdm845_vbif,
2844-
.reg_dma_count = 1,
2845-
.dma_cfg = &sdm845_regdma,
28462847
.perf = &qcm2290_perf_data,
28472848
.mdss_irqs = IRQ_SC7180_MASK,
28482849
};

0 commit comments

Comments
 (0)