| Message ID | 20230921-topic-7280_dpu-v1-1-6912a97183d5@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | SC7280 DPU fixups | expand |
On 9/20/2023 3:46 PM, Konrad Dybcio wrote: > Commit 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 > macros") unrolled a macro incorrectly. Fix that. > No, its correct from what i can tell. Before inlining it was using PP_BLK_DITHER macro and not PP_BLK. PP_BLK_DITHER has a len of 0 and not 0xd4. Hence I cannot see whats wrong here. > Fixes: 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 macros") > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > index 3b5061c4402a..dc3198335164 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > @@ -126,7 +126,7 @@ static const struct dpu_dspp_cfg sc7280_dspp[] = { > static const struct dpu_pingpong_cfg sc7280_pp[] = { > { > .name = "pingpong_0", .id = PINGPONG_0, > - .base = 0x69000, .len = 0, > + .base = 0x69000, .len = 0xd4, > .features = BIT(DPU_PINGPONG_DITHER), > .sblk = &sc7280_pp_sblk, > .merge_3d = 0, > @@ -134,7 +134,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { > .intr_rdptr = -1, > }, { > .name = "pingpong_1", .id = PINGPONG_1, > - .base = 0x6a000, .len = 0, > + .base = 0x6a000, .len = 0xd4, > .features = BIT(DPU_PINGPONG_DITHER), > .sblk = &sc7280_pp_sblk, > .merge_3d = 0, > @@ -142,7 +142,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { > .intr_rdptr = -1, > }, { > .name = "pingpong_2", .id = PINGPONG_2, > - .base = 0x6b000, .len = 0, > + .base = 0x6b000, .len = 0xd4, > .features = BIT(DPU_PINGPONG_DITHER), > .sblk = &sc7280_pp_sblk, > .merge_3d = 0, > @@ -150,7 +150,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { > .intr_rdptr = -1, > }, { > .name = "pingpong_3", .id = PINGPONG_3, > - .base = 0x6c000, .len = 0, > + .base = 0x6c000, .len = 0xd4, > .features = BIT(DPU_PINGPONG_DITHER), > .sblk = &sc7280_pp_sblk, > .merge_3d = 0, >
On 9/21/23 01:41, Abhinav Kumar wrote: > > > On 9/20/2023 3:46 PM, Konrad Dybcio wrote: >> Commit 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 >> macros") unrolled a macro incorrectly. Fix that. >> > > No, its correct from what i can tell. > > Before inlining it was using PP_BLK_DITHER macro and not PP_BLK. > > PP_BLK_DITHER has a len of 0 and not 0xd4. > > Hence I cannot see whats wrong here. Right, I misread the thing.. Konrad
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 3b5061c4402a..dc3198335164 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -126,7 +126,7 @@ static const struct dpu_dspp_cfg sc7280_dspp[] = { static const struct dpu_pingpong_cfg sc7280_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, - .base = 0x69000, .len = 0, + .base = 0x69000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, @@ -134,7 +134,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { .intr_rdptr = -1, }, { .name = "pingpong_1", .id = PINGPONG_1, - .base = 0x6a000, .len = 0, + .base = 0x6a000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, @@ -142,7 +142,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { .intr_rdptr = -1, }, { .name = "pingpong_2", .id = PINGPONG_2, - .base = 0x6b000, .len = 0, + .base = 0x6b000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, @@ -150,7 +150,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { .intr_rdptr = -1, }, { .name = "pingpong_3", .id = PINGPONG_3, - .base = 0x6c000, .len = 0, + .base = 0x6c000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0,
Commit 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 macros") unrolled a macro incorrectly. Fix that. Fixes: 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 macros") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)