[PATCH 3/3] drm/msm/dpu: Introduce SC8280XP

[Steev Klimaszewski]

On Wed, Aug 10, 2022 at 11:28 PM Steev Klimaszewski <steev at kali.org> wrote:
>
> Hi Bjorn,
>
>
> On Wed, Aug 10, 2022 at 10:58 PM Bjorn Andersson
> <bjorn.andersson at linaro.org> wrote:
> >
> > The Qualcomm SC8280XP platform contains DPU version 8.0.0, has 9
> > interfaces, 2 DSI controllers and 4 DisplayPort controllers. Extend the
> > necessary definitions and describe the DPU in the SC8280XP.
> >
> > Signed-off-by: Bjorn Andersson <bjorn.andersson at linaro.org>
> > ---
> >
> > Note that MSM_DP_CONTROLLER_3 is also defined in the DP series and as such a
> > trivial conflict will occur when merging the latter of the two series.
> >
> >  .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c    | 211 ++++++++++++++++++
> >  .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h    |   1 +
> >  .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c |  18 ++
> >  .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h |   3 +
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h   |   2 +
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c       |   1 +
> >  drivers/gpu/drm/msm/msm_drv.h                 |   1 +
> >  drivers/gpu/drm/msm/msm_mdss.c                |   2 +
> >  8 files changed, 239 insertions(+)
> >
> <snip>
> >
> > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
> > index b3689a2d27d7..5978c6e26a1e 100644
> > --- a/drivers/gpu/drm/msm/msm_drv.h
> > +++ b/drivers/gpu/drm/msm/msm_drv.h
> > @@ -55,6 +55,7 @@ enum msm_dp_controller {
> >         MSM_DP_CONTROLLER_0,
> >         MSM_DP_CONTROLLER_1,
> >         MSM_DP_CONTROLLER_2,
> > +       MSM_DP_CONTROLLER_3,
> >         MSM_DP_CONTROLLER_COUNT,
> >  };
> >
> This seems to also be part of
> https://lore.kernel.org/r/20220810040745.3582985-6-bjorn.andersson@linaro.org
> (but only th msm_drv.h hunk
Sorry, wrong copy buffer - it's part of this patchset -
https://lore.kernel.org/all/20220810035013.3582848-4-bjorn.andersson@linaro.org/

>
> >
> > diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c
> > index e13c5c12b775..7c391fab6263 100644
> > --- a/drivers/gpu/drm/msm/msm_mdss.c
> > +++ b/drivers/gpu/drm/msm/msm_mdss.c
> > @@ -208,6 +208,7 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss)
> >                 writel_relaxed(0x420, msm_mdss->mmio + UBWC_STATIC);
> >                 break;
> >         case DPU_HW_VER_600:
> > +       case DPU_HW_VER_800:
> >                 /* TODO: 0x102e for LP_DDR4 */
> >                 writel_relaxed(0x103e, msm_mdss->mmio + UBWC_STATIC);
> >                 writel_relaxed(2, msm_mdss->mmio + UBWC_CTRL_2);
> > @@ -445,6 +446,7 @@ static const struct of_device_id mdss_dt_match[] = {
> >         { .compatible = "qcom,sc7180-mdss" },
> >         { .compatible = "qcom,sc7280-mdss" },
> >         { .compatible = "qcom,sc8180x-mdss" },
> > +       { .compatible = "qcom,sc8280xp-mdss" },
> >         { .compatible = "qcom,sm8150-mdss" },
> >         { .compatible = "qcom,sm8250-mdss" },
> >         {}
> > --
> > 2.35.1
> >
> -- steev