Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210129073436.2429834-1-hsinyi@chromium.org> <20210129073436.2429834-5-hsinyi@chromium.org>
 <1611908500.31184.6.camel@mtksdaap41>
In-Reply-To: <1611908500.31184.6.camel@mtksdaap41>
From:   Chun-Kuang Hu <chunkuang.hu@kernel.org>
Date:   Sun, 31 Jan 2021 11:56:11 +0800
Message-ID: <CAAOTY_8PhKLEuwq4u9tK7z0yfbU=La+DQ8+Ahg1OTe0d5o4qhw@mail.gmail.com>
Subject: Re: [PATCH v4 4/8] drm/mediatek: enable OVL_LAYER_SMI_ID_EN for
 multi-layer usecase
To:     CK Hu <ck.hu@mediatek.com>
Cc:     Hsin-Yi Wang <hsinyi@chromium.org>,
        Mark Rutland <mark.rutland@arm.com>,
        DTML <devicetree@vger.kernel.org>,
        David Airlie <airlied@linux.ie>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        DRI Development <dri-devel@lists.freedesktop.org>,
        Yongqiang Niu <yongqiang.niu@mediatek.com>,
        "moderated list:ARM/Mediatek SoC support" 
        <linux-mediatek@lists.infradead.org>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi, Hsin-Yi:

CK Hu <ck.hu@mediatek.com> =E6=96=BC 2021=E5=B9=B41=E6=9C=8829=E6=97=A5 =E9=
=80=B1=E4=BA=94 =E4=B8=8B=E5=8D=884:21=E5=AF=AB=E9=81=93=EF=BC=9A
>
> Hi, Hsin-Yi:
>
> On Fri, 2021-01-29 at 15:34 +0800, Hsin-Yi Wang wrote:
> > From: Yongqiang Niu <yongqiang.niu@mediatek.com>
> >
> > enable OVL_LAYER_SMI_ID_EN for multi-layer usecase, without this patch,
> > ovl will hang up when more than 1 layer enabled.
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>

Applied to mediatek-drm-next [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/=
log/?h=3Dmediatek-drm-next

Regards,
Chun-Kuang.

>
> >
> > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
> > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 17 +++++++++++++++++
> >  1 file changed, 17 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/=
mediatek/mtk_disp_ovl.c
> > index da7e38a28759b..961f87f8d4d15 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -24,6 +24,7 @@
> >  #define DISP_REG_OVL_RST                     0x0014
> >  #define DISP_REG_OVL_ROI_SIZE                        0x0020
> >  #define DISP_REG_OVL_DATAPATH_CON            0x0024
> > +#define OVL_LAYER_SMI_ID_EN                          BIT(0)
> >  #define OVL_BGCLR_SEL_IN                             BIT(2)
> >  #define DISP_REG_OVL_ROI_BGCLR                       0x0028
> >  #define DISP_REG_OVL_SRC_CON                 0x002c
> > @@ -62,6 +63,7 @@ struct mtk_disp_ovl_data {
> >       unsigned int gmc_bits;
> >       unsigned int layer_nr;
> >       bool fmt_rgb565_is_0;
> > +     bool smi_id_en;
> >  };
> >
> >  /**
> > @@ -134,6 +136,13 @@ void mtk_ovl_start(struct device *dev)
> >  {
> >       struct mtk_disp_ovl *ovl =3D dev_get_drvdata(dev);
> >
> > +     if (ovl->data->smi_id_en) {
> > +             unsigned int reg;
> > +
> > +             reg =3D readl(ovl->regs + DISP_REG_OVL_DATAPATH_CON);
> > +             reg =3D reg | OVL_LAYER_SMI_ID_EN;
> > +             writel_relaxed(reg, ovl->regs + DISP_REG_OVL_DATAPATH_CON=
);
> > +     }
> >       writel_relaxed(0x1, ovl->regs + DISP_REG_OVL_EN);
> >  }
> >
> > @@ -142,6 +151,14 @@ void mtk_ovl_stop(struct device *dev)
> >       struct mtk_disp_ovl *ovl =3D dev_get_drvdata(dev);
> >
> >       writel_relaxed(0x0, ovl->regs + DISP_REG_OVL_EN);
> > +     if (ovl->data->smi_id_en) {
> > +             unsigned int reg;
> > +
> > +             reg =3D readl(ovl->regs + DISP_REG_OVL_DATAPATH_CON);
> > +             reg =3D reg & ~OVL_LAYER_SMI_ID_EN;
> > +             writel_relaxed(reg, ovl->regs + DISP_REG_OVL_DATAPATH_CON=
);
> > +     }
> > +
> >  }
> >
> >  void mtk_ovl_config(struct device *dev, unsigned int w,
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel