Re: [PATCH v2 3/4] drm/msm/dpu: remove GC related code from dpu catalog

[Abhinav Kumar]

On 4/27/2023 8:57 AM, Dmitry Baryshkov wrote:
> On 26/04/2023 22:22, Abhinav Kumar wrote:
> > Since Gamma Correction (GC) block is currently unused, drop
> > related code from the dpu hardware catalog otherwise this
> > becomes a burden to carry across chipsets in the catalog.
> >
> > Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> > Link: 
> > https://lore.kernel.org/r/20230421224721.12738-2-quic_abhinavk@xxxxxxxxxxx 
> >
> > ---
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 +---
> >   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 6 ------
> >   2 files changed, 1 insertion(+), 9 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c 
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> > index 03f162af1a50..badfc3680485 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> > @@ -91,7 +91,7 @@
> >   #define MERGE_3D_SM8150_MASK (0)
> > -#define DSPP_MSM8998_MASK BIT(DPU_DSPP_PCC) | BIT(DPU_DSPP_GC)
> > +#define DSPP_MSM8998_MASK BIT(DPU_DSPP_PCC)
> >   #define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC)
> > @@ -449,8 +449,6 @@ static const struct dpu_lm_sub_blks 
> > qcm2290_lm_sblk = {
> >   static const struct dpu_dspp_sub_blks msm8998_dspp_sblk = {
> >       .pcc = {.id = DPU_DSPP_PCC, .base = 0x1700,
> >           .len = 0x90, .version = 0x10007},
> > -    .gc = { .id = DPU_DSPP_GC, .base = 0x17c0,
> > -        .len = 0x90, .version = 0x10007},
> >   };
> >   static const struct dpu_dspp_sub_blks sc7180_dspp_sblk = {
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h 
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> > index 71584cd56fd7..e0dcef04bc61 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> > @@ -127,12 +127,10 @@ enum {
> >   /**
> >    * DSPP sub-blocks
> >    * @DPU_DSPP_PCC             Panel color correction block
> > - * @DPU_DSPP_GC              Gamma correction block
> >    * @DPU_DSPP_IGC             Inverse gamma correction block
> >    */
> >   enum {
> >       DPU_DSPP_PCC = 0x1,
> > -    DPU_DSPP_GC,
> >       DPU_DSPP_IGC,
>
> Don't we need to remove this one too (in the previous patch)?

Yes, we should. I thought of it right after sending this. will push a v3 
which fixes it in the prev patch.

> >       DPU_DSPP_MAX
> >   };
> > @@ -433,22 +431,18 @@ struct dpu_sspp_sub_blks {
> >    * @maxwidth:               Max pixel width supported by this mixer
> >    * @maxblendstages:         Max number of blend-stages supported
> >    * @blendstage_base:        Blend-stage register base offset
> > - * @gc: gamma correction block
> >    */
> >   struct dpu_lm_sub_blks {
> >       u32 maxwidth;
> >       u32 maxblendstages;
> >       u32 blendstage_base[MAX_BLOCKS];
> > -    struct dpu_pp_blk gc;
> >   };
> >   /**
> >    * struct dpu_dspp_sub_blks: Information of DSPP block
> > - * @gc : gamma correction block
> >    * @pcc: pixel color correction block
> >    */
> >   struct dpu_dspp_sub_blks {
> > -    struct dpu_pp_blk gc;
> >       struct dpu_pp_blk pcc;
> >   };