From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D584C2D0DA for ; Wed, 25 Dec 2019 10:19:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0DE542073B for ; Wed, 25 Dec 2019 10:19:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="e6PvdaMD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DE542073B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3AEB89FA9; Wed, 25 Dec 2019 10:19:22 +0000 (UTC) Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) by gabe.freedesktop.org (Postfix) with ESMTPS id B105689DFE for ; Wed, 25 Dec 2019 02:43:35 +0000 (UTC) Received: by mail-io1-xd41.google.com with SMTP id z193so20489326iof.1 for ; Tue, 24 Dec 2019 18:43:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FkHC2/wKSq+9T5DT5vcW7QSWQ50wf/NgZ+c4oz1aKDA=; b=e6PvdaMDArS01x+rA/4rEgHHyXQsEFQXUOMD/qzLDQrnSXPSlWFSAdHQsTe0vLl8WF e0cTzroSXFXt9qt1oN02/Sc77IBkDZp+CB9BdRmrIly84ZjTXQLLyM9p0IvfvXfoA5Zq 9QgYD/O52UanjFitZwCweHULYup2Q6LTFUPffwMtGvIlzgX+rPqcOSwmTC9rvdtHtO01 GQrXIWc8mx0B/jXqK2GaJdwWvlr2LZCX7dwek0E6qz+diWVFYU6qVTrVgJdSNb2wDBiP /8lljXXwr1/WJrUPGSVCBWgg1QFc2CzJzOBww0WpYQix9nshkGv/Je7FMky0G7U3MONI jWTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FkHC2/wKSq+9T5DT5vcW7QSWQ50wf/NgZ+c4oz1aKDA=; b=rDEzH25wODaN+o4DkJ1qJqOX+1daZYVdfPGkH/Kl5rvVPvdqkMqNqVniLkbcHRdzIE U2EE4o9Us7/eI9japbhUXPQ5G4nYSlL7FKQnrRE0Drh3MsCs7A+ARHAUs6sez/1Q1+d5 +w3egDYeRYK/+laINBdEFNHCFTVq1tR8l1L7dLFJYDFOkEPMfIsL+tT6r92vFx0+LT1q B2nVM0ItbMF6+9yv5jDVOhEYlorSzXcPQPQ1FstvNcOBegOq0VFtLMhHwAf/taAcQGNt 3rWUGTDJVAQAFVtYFpbHDKBu9KUThTZs1KibQopniHsGSwbEL9KO+AgakB9iRr4IvsWF dqHQ== X-Gm-Message-State: APjAAAW+nU/STGxVUYVLrlXTMuad0NVeDZJ/jifktga3c8Akv8YtEh27 5g/lvTMnoWIvkxMXpRWF93HndZ2EbK0YSzqEc/G6kQ== X-Google-Smtp-Source: APXvYqz/0WFXNV4ZzBRCqXZrnJBy/QW94PrShVgM6ynZkJrS23cwrC84TmMofRqykXALcWGmbp7pTVRXuLAtiW0t6y0= X-Received: by 2002:a02:85e8:: with SMTP id d95mr30755183jai.92.1577241814680; Tue, 24 Dec 2019 18:43:34 -0800 (PST) MIME-Version: 1.0 References: <20191211154901.176256-1-markyacoub@google.com> <1577240723.3440.1.camel@mtksdaap41> In-Reply-To: <1577240723.3440.1.camel@mtksdaap41> From: Mark Yacoub Date: Tue, 24 Dec 2019 21:43:22 -0500 Message-ID: Subject: Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off To: CK Hu X-Mailman-Approved-At: Wed, 25 Dec 2019 10:19:18 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniele Castagna , David Airlie , dri-devel@lists.freedesktop.org, Sean Paul , Matthias Brugger , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: multipart/mixed; boundary="===============0304124183==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --===============0304124183== Content-Type: multipart/alternative; boundary="000000000000171bb6059a7e3ae1" --000000000000171bb6059a7e3ae1 Content-Type: text/plain; charset="UTF-8" Thanks for the update! On Tue, Dec 24, 2019, 9:25 PM CK Hu 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 > > To: CK Hu > > To: dri-devel@lists.freedesktop.org > > Cc: Daniele Castagna > > Cc: Philipp Zabel > > Cc: David Airlie > > Cc: Daniel Vetter > > Cc: Matthias Brugger > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-mediatek@lists.infradead.org > > Signed-off-by: Mark Yacoub > > --- > > 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) > > --000000000000171bb6059a7e3ae1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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 t= he
> pending state is enabled.

For this series, applied to mediatek-drm-next-5.6 [1], thanks.

[1]
https://gith= ub.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>
> ---
>=C2=A0 drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
>=C2=A0 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_c= omp *comp, unsigned int idx,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned int src_size =3D (pending->heigh= t << 16) | pending->width;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0unsigned int con;
>=C2=A0
> -=C2=A0 =C2=A0 =C2=A0if (!pending->enable)
> +=C2=A0 =C2=A0 =C2=A0if (!pending->enable) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mtk_ovl_layer_of= f(comp, idx);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
> +=C2=A0 =C2=A0 =C2=A0}
>=C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0con =3D ovl_fmt_convert(ovl, fmt);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if (idx !=3D 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_co= mp *comp, unsigned int idx,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0writel_relaxed(offset, comp->regs + DISP_= REG_OVL_OFFSET(idx));
>=C2=A0 =C2=A0 =C2=A0 =C2=A0writel_relaxed(addr, comp->regs + DISP_RE= G_OVL_ADDR(ovl, idx));
>=C2=A0
> -=C2=A0 =C2=A0 =C2=A0if (pending->enable)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mtk_ovl_layer_on(comp= , idx);
> +=C2=A0 =C2=A0 =C2=A0mtk_ovl_layer_on(comp, idx);
>=C2=A0 }
>=C2=A0
>=C2=A0 static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)

--000000000000171bb6059a7e3ae1-- --===============0304124183== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============0304124183==--