tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/msm/dpu: get rid of DPU_PINGPONG_DSC

Continue migration to the MDSS-revision based checks and replace
DPU_PINGPONG_DSC feature bit with the core_major_ver < 7 check.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/655390/
Link: https://lore.kernel.org/r/20250522-dpu-drop-features-v5-16-3b2085a07884@oss.qualcomm.com

authored by

Dmitry Baryshkov and committed by
Dmitry Baryshkov fcdd6cbb 458de858

+3 -12
-4
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h
··· 181 181 { 182 182 .name = "pingpong_0", .id = PINGPONG_0, 183 183 .base = 0x70000, .len = 0xd4, 184 - .features = PINGPONG_MSM8996_MASK, 185 184 .sblk = &msm8996_pp_sblk, 186 185 .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), 187 186 .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), 188 187 }, { 189 188 .name = "pingpong_1", .id = PINGPONG_1, 190 189 .base = 0x70800, .len = 0xd4, 191 - .features = PINGPONG_MSM8996_MASK, 192 190 .sblk = &msm8996_pp_sblk, 193 191 .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), 194 192 .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), 195 193 }, { 196 194 .name = "pingpong_2", .id = PINGPONG_2, 197 195 .base = 0x71000, .len = 0xd4, 198 - .features = PINGPONG_MSM8996_MASK, 199 196 .sblk = &msm8996_pp_sblk, 200 197 .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), 201 198 .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14), 202 199 }, { 203 200 .name = "pingpong_3", .id = PINGPONG_3, 204 201 .base = 0x71800, .len = 0xd4, 205 - .features = PINGPONG_MSM8996_MASK, 206 202 .sblk = &msm8996_pp_sblk, 207 203 .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), 208 204 .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15),
+2 -5
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
··· 95 95 #define MIXER_QCM2290_MASK \ 96 96 (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) 97 97 98 - #define PINGPONG_MSM8996_MASK \ 99 - (BIT(DPU_PINGPONG_DSC)) 100 - 101 98 #define PINGPONG_SDM845_MASK \ 102 - (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) 99 + (BIT(DPU_PINGPONG_DITHER)) 103 100 104 101 #define PINGPONG_SM8150_MASK \ 105 - (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) 102 + (BIT(DPU_PINGPONG_DITHER)) 106 103 107 104 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ 108 105 BIT(DPU_WB_UBWC) | \
-2
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
··· 118 118 * @DPU_PINGPONG_SPLIT PP block supports split fifo 119 119 * @DPU_PINGPONG_SLAVE PP block is a suitable slave for split fifo 120 120 * @DPU_PINGPONG_DITHER Dither blocks 121 - * @DPU_PINGPONG_DSC PP block supports DSC 122 121 * @DPU_PINGPONG_MAX 123 122 */ 124 123 enum { 125 124 DPU_PINGPONG_SPLIT = 0x1, 126 125 DPU_PINGPONG_SLAVE, 127 126 DPU_PINGPONG_DITHER, 128 - DPU_PINGPONG_DSC, 129 127 DPU_PINGPONG_MAX 130 128 }; 131 129
+1 -1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
··· 319 319 c->ops.disable_autorefresh = dpu_hw_pp_disable_autorefresh; 320 320 } 321 321 322 - if (test_bit(DPU_PINGPONG_DSC, &cfg->features)) { 322 + if (mdss_rev->core_major_ver < 7) { 323 323 c->ops.setup_dsc = dpu_hw_pp_setup_dsc; 324 324 c->ops.enable_dsc = dpu_hw_pp_dsc_enable; 325 325 c->ops.disable_dsc = dpu_hw_pp_dsc_disable;