| Message ID | 20191211154901.176256-1-markyacoub@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off | expand |
On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote: > > Hi, Mark: > > On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote: > > drm/mediatek: return if plane pending state is disabled. > > > > If the plane pending state is disabled, call mtk_ovl_layer_off then > > return. > > This guarantees that that the state is valid for all operations when the > > pending state is enabled. > > Reviewed-by: CK Hu <ck.hu@mediatek.com> > Thanks for reviewing these patches, CK. When you apply them to your tree, could you please fixup the subjects with the correct prefixes? Both patches are also Reviewed-by: Sean Paul <seanpaul@chromium.org> Sean > > > > Suggested-by: Sean Paul <seanpaul@chromium.org> > > To: CK Hu <ck.hu@mediatek.com> > > To: dri-devel@lists.freedesktop.org > > Cc: Daniele Castagna <dcastagna@chromium.org> > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Matthias Brugger <matthias.bgg@gmail.com> > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-mediatek@lists.infradead.org > > Signed-off-by: Mark Yacoub <markyacoub@google.com> > > --- > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > index 4a55bb6e2213..526b595eeff9 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > > unsigned int src_size = (pending->height << 16) | pending->width; > > unsigned int con; > > > > - if (!pending->enable) > > + if (!pending->enable) { > > mtk_ovl_layer_off(comp, idx); > > + return; > > + } > > > > con = ovl_fmt_convert(ovl, fmt); > > if (idx != 0) > > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx)); > > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx)); > > > > - if (pending->enable) > > - mtk_ovl_layer_on(comp, idx); > > + mtk_ovl_layer_on(comp, idx); > > } > > > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp) > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi, Sean: On Thu, 2019-12-12 at 09:13 -0500, Sean Paul wrote: > On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote: > > > > Hi, Mark: > > > > On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote: > > > drm/mediatek: return if plane pending state is disabled. > > > > > > If the plane pending state is disabled, call mtk_ovl_layer_off then > > > return. > > > This guarantees that that the state is valid for all operations when the > > > pending state is enabled. > > > > Reviewed-by: CK Hu <ck.hu@mediatek.com> > > > > Thanks for reviewing these patches, CK. When you apply them to your > tree, could you please fixup the subjects with the correct prefixes? Thanks for your notice. I've already planed to do so. Regards, CK > > Both patches are also > > Reviewed-by: Sean Paul <seanpaul@chromium.org> > > Sean > > > > > > > Suggested-by: Sean Paul <seanpaul@chromium.org> > > > To: CK Hu <ck.hu@mediatek.com> > > > To: dri-devel@lists.freedesktop.org > > > Cc: Daniele Castagna <dcastagna@chromium.org> > > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > > > Cc: David Airlie <airlied@linux.ie> > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > Cc: Matthias Brugger <matthias.bgg@gmail.com> > > > Cc: linux-arm-kernel@lists.infradead.org > > > Cc: linux-mediatek@lists.infradead.org > > > Signed-off-by: Mark Yacoub <markyacoub@google.com> > > > --- > > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++--- > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > > index 4a55bb6e2213..526b595eeff9 100644 > > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > > > unsigned int src_size = (pending->height << 16) | pending->width; > > > unsigned int con; > > > > > > - if (!pending->enable) > > > + if (!pending->enable) { > > > mtk_ovl_layer_off(comp, idx); > > > + return; > > > + } > > > > > > con = ovl_fmt_convert(ovl, fmt); > > > if (idx != 0) > > > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > > > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx)); > > > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx)); > > > > > > - if (pending->enable) > > > - mtk_ovl_layer_on(comp, idx); > > > + mtk_ovl_layer_on(comp, idx); > > > } > > > > > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp) > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
Hi, Mark: On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote: > drm/mediatek: return if plane pending state is disabled. > > If the plane pending state is disabled, call mtk_ovl_layer_off then > return. > This guarantees that that the state is valid for all operations when the > pending state is enabled. For this series, applied to mediatek-drm-next-5.6 [1], thanks. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 Regards, CK > > Suggested-by: Sean Paul <seanpaul@chromium.org> > To: CK Hu <ck.hu@mediatek.com> > To: dri-devel@lists.freedesktop.org > Cc: Daniele Castagna <dcastagna@chromium.org> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-mediatek@lists.infradead.org > Signed-off-by: Mark Yacoub <markyacoub@google.com> > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index 4a55bb6e2213..526b595eeff9 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > unsigned int src_size = (pending->height << 16) | pending->width; > unsigned int con; > > - if (!pending->enable) > + if (!pending->enable) { > mtk_ovl_layer_off(comp, idx); > + return; > + } > > con = ovl_fmt_convert(ovl, fmt); > if (idx != 0) > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx)); > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx)); > > - if (pending->enable) > - mtk_ovl_layer_on(comp, idx); > + mtk_ovl_layer_on(comp, idx); > } > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
Thanks for the update! On Tue, Dec 24, 2019, 9:25 PM CK Hu <ck.hu@mediatek.com> wrote: > Hi, Mark: > > On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote: > > drm/mediatek: return if plane pending state is disabled. > > > > If the plane pending state is disabled, call mtk_ovl_layer_off then > > return. > > This guarantees that that the state is valid for all operations when the > > pending state is enabled. > > For this series, applied to mediatek-drm-next-5.6 [1], thanks. > > [1] > > https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6 > > Regards, > CK > > > > > Suggested-by: Sean Paul <seanpaul@chromium.org> > > To: CK Hu <ck.hu@mediatek.com> > > To: dri-devel@lists.freedesktop.org > > Cc: Daniele Castagna <dcastagna@chromium.org> > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Matthias Brugger <matthias.bgg@gmail.com> > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-mediatek@lists.infradead.org > > Signed-off-by: Mark Yacoub <markyacoub@google.com> > > --- > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > index 4a55bb6e2213..526b595eeff9 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct > mtk_ddp_comp *comp, unsigned int idx, > > unsigned int src_size = (pending->height << 16) | pending->width; > > unsigned int con; > > > > - if (!pending->enable) > > + if (!pending->enable) { > > mtk_ovl_layer_off(comp, idx); > > + return; > > + } > > > > con = ovl_fmt_convert(ovl, fmt); > > if (idx != 0) > > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp > *comp, unsigned int idx, > > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx)); > > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx)); > > > > - if (pending->enable) > > - mtk_ovl_layer_on(comp, idx); > > + mtk_ovl_layer_on(comp, idx); > > } > > > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp) > >
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c index 4a55bb6e2213..526b595eeff9 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, unsigned int src_size = (pending->height << 16) | pending->width; unsigned int con; - if (!pending->enable) + if (!pending->enable) { mtk_ovl_layer_off(comp, idx); + return; + } con = ovl_fmt_convert(ovl, fmt); if (idx != 0) @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx)); writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx)); - if (pending->enable) - mtk_ovl_layer_on(comp, idx); + mtk_ovl_layer_on(comp, idx); } static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
drm/mediatek: return if plane pending state is disabled. If the plane pending state is disabled, call mtk_ovl_layer_off then return. This guarantees that that the state is valid for all operations when the pending state is enabled. Suggested-by: Sean Paul <seanpaul@chromium.org> To: CK Hu <ck.hu@mediatek.com> To: dri-devel@lists.freedesktop.org Cc: Daniele Castagna <dcastagna@chromium.org> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org Signed-off-by: Mark Yacoub <markyacoub@google.com> --- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)