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=-13.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 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 14DF5C2D0C3 for ; Wed, 25 Dec 2019 02:25:33 +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 C1FC820663 for ; Wed, 25 Dec 2019 02:25:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="iR4s97vl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1FC820663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.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 2F37289DFD; Wed, 25 Dec 2019 02:25:31 +0000 (UTC) Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FE8589DFD for ; Wed, 25 Dec 2019 02:25:29 +0000 (UTC) X-UUID: 34c2963eccb3456ab16f4469a485cc2b-20191225 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=DLVZeoCaU5m6aKOaiGtvgtJR1KbLi2bWm0K2n0iyqrI=; b=iR4s97vlZmbFxLNvMGYlt1oVJ/o/fTz0Rq7Vis7q3HUrCEAIiAv6tXKz8bx0u6A6duonBBEMKH8yyEgeC3hHSMBsTBZhuNpkOjDnnGJnKO+Ofg7O00eU66WzCwMKI4dtxzLrkT47xwHZvfsMocFATmzEPXqEY9vVfKZMdD3UXQE=; X-UUID: 34c2963eccb3456ab16f4469a485cc2b-20191225 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1073298480; Wed, 25 Dec 2019 10:25:25 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 25 Dec 2019 10:25:19 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 25 Dec 2019 10:25:38 +0800 Message-ID: <1577240723.3440.1.camel@mtksdaap41> Subject: Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off From: CK Hu To: Mark Yacoub Date: Wed, 25 Dec 2019 10:25:23 +0800 In-Reply-To: <20191211154901.176256-1-markyacoub@google.com> References: <20191211154901.176256-1-markyacoub@google.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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) _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel