[PATCH v8 10/19] drm/mediatek: dpi: move swap_shift to board config

[Guillaume Ranquet]

Quoting Chun-Kuang Hu (2022-02-21 04:24:32)
> Hi, Guillaume:
>
> Guillaume Ranquet <granquet at baylibre.com> 於 2022年2月18日 週五 下午10:56寫道：
> >
> > Add flexibility by moving the swap shift value to board config
> >
> > Signed-off-by: Guillaume Ranquet <granquet at baylibre.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > index 0d3acd08ea358..ec221e24e0fee 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > @@ -131,6 +131,7 @@ struct mtk_dpi_conf {
> >         u32 dimension_mask;
> >         // Mask used for HSIZE and VSIZE (no shift)
> >         u32 hvsize_mask;
> > +       u32 channel_swap_shift;
> >         const struct mtk_dpi_yc_limit *limit;
> >  };
> >
> > @@ -349,7 +350,8 @@ static void mtk_dpi_config_channel_swap(struct mtk_dpi *dpi,
> >                 break;
> >         }
> >
> > -       mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, val << CH_SWAP, CH_SWAP_MASK);
> > +       mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, val << CH_SWAP,
> > +                    CH_SWAP_MASK << dpi->conf->channel_swap_shift);
>
> This may be wrong because of these definition:
>
> #define DPINTF_CH_SWAP BIT(1)
> #define DPINTF_CH_SWAP_MASK (0x7 << 1)
>
> Regards,
> Chun-Kuang.
>

You are right, DPINTF_CH_SWAP_MASK is unused, which is wrong on multiple levels.

> >  }
> >
> >  static void mtk_dpi_config_yuv422_enable(struct mtk_dpi *dpi, bool enable)
> > @@ -821,6 +823,7 @@ static const struct mtk_dpi_conf mt8173_conf = {
> >         .swap_input_support = true,
> >         .dimension_mask = HPW_MASK,
> >         .hvsize_mask = HSIZE_MASK,
> > +       .channel_swap_shift = CH_SWAP,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > @@ -835,6 +838,7 @@ static const struct mtk_dpi_conf mt2701_conf = {
> >         .swap_input_support = true,
> >         .dimension_mask = HPW_MASK,
> >         .hvsize_mask = HSIZE_MASK,
> > +       .channel_swap_shift = CH_SWAP,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > @@ -848,6 +852,7 @@ static const struct mtk_dpi_conf mt8183_conf = {
> >         .swap_input_support = true,
> >         .dimension_mask = HPW_MASK,
> >         .hvsize_mask = HSIZE_MASK,
> > +       .channel_swap_shift = CH_SWAP,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > @@ -861,6 +866,7 @@ static const struct mtk_dpi_conf mt8192_conf = {
> >         .swap_input_support = true,
> >         .dimension_mask = HPW_MASK,
> >         .hvsize_mask = HSIZE_MASK,
> > +       .channel_swap_shift = CH_SWAP,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > --
> > 2.34.1
> >