Message ID | 1686082272-22191-1-git-send-email-quic_khsieh@quicinc.com |
---|---|
State | Superseded |
Headers | show |
Series | [v17] drm/msm/dpu: add DSC blocks to the catalog of MSM8998 | expand |
On 06/06/2023 23:11, Kuogee Hsieh wrote: > From: Abhinav Kumar <quic_abhinavk@quicinc.com> > > Some platforms have DSC blocks which have not been declared in the catalog. > Complete DSC 1.1 support for all platforms by adding the missing blocks to > MSM8998. 'Some platforms' doesn't make sense if we are talking about a single poor msm8998. > > Changes in v9: > -- add MSM8998 and SC8180x to commit title > > Changes in v10: > -- fix grammar at commit text > > Changes in v12: > -- fix "titil" with "title" at changes in v9 > > Changes in v14: > -- "dsc" tp "DSC" at commit title > > Changes in v15: > -- fix merge conflicts at dpu_5_1_sc8180x.h > > Changes in v16 > -- fix cherry-pick error by deleting both redundant .dsc and .dsc_count > assignment from dpu_5_1_sc8180x.h > > Changes in v17 > -- remove sc8180x from both commit title and text > -- remove Reviewed-by > > Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h > index 3c732a0..7d0d0e7 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h > @@ -126,6 +126,11 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = { > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)), > }; > > +static const struct dpu_dsc_cfg msm8998_dsc[] = { > + DSC_BLK("dsc_0", DSC_0, 0x80000, 0), > + DSC_BLK("dsc_1", DSC_1, 0x80400, 0), > +}; > + > static const struct dpu_dspp_cfg msm8998_dspp[] = { > DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, > &msm8998_dspp_sblk), > @@ -199,6 +204,8 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = { > .dspp = msm8998_dspp, > .pingpong_count = ARRAY_SIZE(msm8998_pp), > .pingpong = msm8998_pp, > + .dsc_count = ARRAY_SIZE(msm8998_dsc), > + .dsc = msm8998_dsc, > .intf_count = ARRAY_SIZE(msm8998_intf), > .intf = msm8998_intf, > .vbif_count = ARRAY_SIZE(msm8998_vbif),
Hi Dmitry On 6/6/2023 1:21 PM, Dmitry Baryshkov wrote: > On 06/06/2023 23:11, Kuogee Hsieh wrote: >> From: Abhinav Kumar <quic_abhinavk@quicinc.com> >> >> Some platforms have DSC blocks which have not been declared in the >> catalog. >> Complete DSC 1.1 support for all platforms by adding the missing >> blocks to >> MSM8998. > > 'Some platforms' doesn't make sense if we are talking about a single > poor msm8998. > If you dont mind, can you please fix this while applying? Thanks for consideration. >> >> Changes in v9: >> -- add MSM8998 and SC8180x to commit title >> >> Changes in v10: >> -- fix grammar at commit text >> >> Changes in v12: >> -- fix "titil" with "title" at changes in v9 >> >> Changes in v14: >> -- "dsc" tp "DSC" at commit title >> >> Changes in v15: >> -- fix merge conflicts at dpu_5_1_sc8180x.h >> >> Changes in v16 >> -- fix cherry-pick error by deleting both redundant .dsc and .dsc_count >> assignment from dpu_5_1_sc8180x.h >> >> Changes in v17 >> -- remove sc8180x from both commit title and text >> -- remove Reviewed-by >> >> Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> >> --- >> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> index 3c732a0..7d0d0e7 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h >> @@ -126,6 +126,11 @@ static const struct dpu_pingpong_cfg msm8998_pp[] >> = { >> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)), >> }; >> +static const struct dpu_dsc_cfg msm8998_dsc[] = { >> + DSC_BLK("dsc_0", DSC_0, 0x80000, 0), >> + DSC_BLK("dsc_1", DSC_1, 0x80400, 0), >> +}; >> + >> static const struct dpu_dspp_cfg msm8998_dspp[] = { >> DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, >> &msm8998_dspp_sblk), >> @@ -199,6 +204,8 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = { >> .dspp = msm8998_dspp, >> .pingpong_count = ARRAY_SIZE(msm8998_pp), >> .pingpong = msm8998_pp, >> + .dsc_count = ARRAY_SIZE(msm8998_dsc), >> + .dsc = msm8998_dsc, >> .intf_count = ARRAY_SIZE(msm8998_intf), >> .intf = msm8998_intf, >> .vbif_count = ARRAY_SIZE(msm8998_vbif), >
On 06/06/2023 23:11, Kuogee Hsieh wrote: > From: Abhinav Kumar <quic_abhinavk@quicinc.com> > > Some platforms have DSC blocks which have not been declared in the catalog. > Complete DSC 1.1 support for all platforms by adding the missing blocks to > MSM8998. > > Changes in v9: > -- add MSM8998 and SC8180x to commit title > > Changes in v10: > -- fix grammar at commit text > > Changes in v12: > -- fix "titil" with "title" at changes in v9 > > Changes in v14: > -- "dsc" tp "DSC" at commit title > > Changes in v15: > -- fix merge conflicts at dpu_5_1_sc8180x.h > > Changes in v16 > -- fix cherry-pick error by deleting both redundant .dsc and .dsc_count > assignment from dpu_5_1_sc8180x.h > > Changes in v17 > -- remove sc8180x from both commit title and text > -- remove Reviewed-by > > Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 7 +++++++ > 1 file changed, 7 insertions(+) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> I'll fix the commit message.
On Tue, 06 Jun 2023 13:11:12 -0700, Kuogee Hsieh wrote: > Some platforms have DSC blocks which have not been declared in the catalog. > Complete DSC 1.1 support for all platforms by adding the missing blocks to > MSM8998. > > Changes in v9: > -- add MSM8998 and SC8180x to commit title > > [...] Applied, thanks! [1/1] drm/msm/dpu: add DSC blocks to the catalog of MSM8998 https://gitlab.freedesktop.org/lumag/msm/-/commit/203b2019b3ac Best regards,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 3c732a0..7d0d0e7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h @@ -126,6 +126,11 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = { DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)), }; +static const struct dpu_dsc_cfg msm8998_dsc[] = { + DSC_BLK("dsc_0", DSC_0, 0x80000, 0), + DSC_BLK("dsc_1", DSC_1, 0x80400, 0), +}; + static const struct dpu_dspp_cfg msm8998_dspp[] = { DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, &msm8998_dspp_sblk), @@ -199,6 +204,8 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = { .dspp = msm8998_dspp, .pingpong_count = ARRAY_SIZE(msm8998_pp), .pingpong = msm8998_pp, + .dsc_count = ARRAY_SIZE(msm8998_dsc), + .dsc = msm8998_dsc, .intf_count = ARRAY_SIZE(msm8998_intf), .intf = msm8998_intf, .vbif_count = ARRAY_SIZE(msm8998_vbif),