<div dir="auto">Thanks for the update!</div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Dec 24, 2019, 9:25 PM CK Hu <<a href="mailto:ck.hu@mediatek.com">ck.hu@mediatek.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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] <a href="https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6" rel="noreferrer noreferrer" target="_blank">https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6</a> Regards, CK > > Suggested-by: Sean Paul <<a href="mailto:seanpaul@chromium.org" target="_blank" rel="noreferrer">seanpaul@chromium.org</a>> > To: CK Hu <<a href="mailto:ck.hu@mediatek.com" target="_blank" rel="noreferrer">ck.hu@mediatek.com</a>> > To: <a href="mailto:dri-devel@lists.freedesktop.org" target="_blank" rel="noreferrer">dri-devel@lists.freedesktop.org</a> > Cc: Daniele Castagna <<a href="mailto:dcastagna@chromium.org" target="_blank" rel="noreferrer">dcastagna@chromium.org</a>> > Cc: Philipp Zabel <<a href="mailto:p.zabel@pengutronix.de" target="_blank" rel="noreferrer">p.zabel@pengutronix.de</a>> > Cc: David Airlie <<a href="mailto:airlied@linux.ie" target="_blank" rel="noreferrer">airlied@linux.ie</a>> > Cc: Daniel Vetter <<a href="mailto:daniel@ffwll.ch" target="_blank" rel="noreferrer">daniel@ffwll.ch</a>> > Cc: Matthias Brugger <<a href="mailto:matthias.bgg@gmail.com" target="_blank" rel="noreferrer">matthias.bgg@gmail.com</a>> > Cc: <a href="mailto:linux-arm-kernel@lists.infradead.org" target="_blank" rel="noreferrer">linux-arm-kernel@lists.infradead.org</a> > Cc: <a href="mailto:linux-mediatek@lists.infradead.org" target="_blank" rel="noreferrer">linux-mediatek@lists.infradead.org</a> > Signed-off-by: Mark Yacoub <<a href="mailto:markyacoub@google.com" target="_blank" rel="noreferrer">markyacoub@google.com</a>> > --- > 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) </blockquote></div>