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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=unavailable 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 6C68BC433B4 for ; Mon, 12 Apr 2021 08:57:51 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 BDF4361244 for ; Mon, 12 Apr 2021 08:57:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDF4361244 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:Reply-To:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:CC:To:From: Subject:Message-ID:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4A/J9FOX0DylQSp1lNq51+Z+sJsnuL0c2RfqTbelhy8=; b=Zywox9CM+TwPM8dFTjaDE7PFxD DffF+HqKr3ASzSJ89SQevfM37TtIQKFt/OaEy9KkHqjt6IfizeH/qTF53IrjC1UobVSWPJkUHWFl/ xXnCS/cOxg/cPeR8A2XHY5Deim+UcvkxsxrGWchvwcnfsxETktgVQM2Yxgi32KtGnN+Th9RQ7+Uf3 gX2K9qsrHhfZVebjnMU1rXRzN0eBaggBCzRIj/0URWRxkLnXz6eFgvMNIdyOY8A0FbIwR1cOMCGhH pA1tf5rrFiHEeoZL++ZsgulvDq1n8NByq8hr7id+L/5s6uP6IgNenBPyh1jAUaPM6pxdlnzJYRrMV EpoQ/2fg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVsMW-006Aqu-JS; Mon, 12 Apr 2021 08:56:04 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVsMA-006Am6-On; Mon, 12 Apr 2021 08:55:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:Reply-To:From: Subject:Message-ID:Sender:Content-ID:Content-Description; bh=iIDDfRaHkAik/yaGKeIMgRx4/xDkVBJ87imyZ0Utbl8=; b=u6bHUfTvp3JUgVw2rS30+X9cvw iDyloYPoj7FuNDBM+PfcbnENeJ/t3vy9KuA/NT08emrimEcyFyjYGBVD2zwQgbV8dUS5wVydYUvQ8 vFL8j7eu5OBHUjWJgVvXchXl4FV3DDKEIOy4n8GskWqWbfy7kJpNq4wLOl1vuL7AJH8M+N2hX2U0u K+NzDUf7mcNzlIr2cR1jUMwF6/kyfFJHwJXdFVVUIXW/+0fcrsJLVMqektExwVw9oD7ThrSh5ZgAk N9XHCfg7lpF0IwIAfUO64d61y+orQoHJAR2P8U8gdrKImP48gGJVTbkZBrfo4y2oybNlYhjnRa4vw ApndKEuw==; Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVsM6-0060Cb-US; Mon, 12 Apr 2021 08:55:40 +0000 X-UUID: fd1d1c6ac8224417aee2745fa4962398-20210412 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:Reply-To:From:Subject:Message-ID; bh=iIDDfRaHkAik/yaGKeIMgRx4/xDkVBJ87imyZ0Utbl8=; b=roOGsbZWJze2HuCZAQR3sgp0ZgWsuj8GGHjWTo8Ed7wZjXEaZrXIRYHjyoJ6Db54hboWGTt1/nGmpEf3gSq3eu0qh4NoLcNoPG+rdWMPxp0RTBmJzTPMgInHAV6elGSlq+Z45VrUWamwNTp9AQMLkVDGYRz/FMFGbE/UY16AwpU=; X-UUID: fd1d1c6ac8224417aee2745fa4962398-20210412 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 454523014; Mon, 12 Apr 2021 01:55:35 -0700 Received: from mtkmbs05n2.mediatek.inc (172.21.101.140) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Apr 2021 01:45:32 -0700 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by mtkmbs05n2.mediatek.inc (172.21.101.140) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Apr 2021 16:45:30 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 12 Apr 2021 16:45:29 +0800 Message-ID: <1618217129.9080.5.camel@mhfsdcap03> Subject: Re: [PATCH v1, 3/3] drm/mediatek: gamma set with cmdq From: Yongqiang Niu To: CK Hu CC: Chun-Kuang Hu , Rob Herring , Philipp Zabel , David Airlie , Daniel Vetter , Mark Rutland , Matthias Brugger , , , , , , Date: Mon, 12 Apr 2021 16:45:29 +0800 In-Reply-To: <1618216127.12699.4.camel@mtksdaap41> References: <1618209347-10816-1-git-send-email-yongqiang.niu@mediatek.com> <1618209347-10816-4-git-send-email-yongqiang.niu@mediatek.com> <1618216127.12699.4.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210412_015539_016878_A71E7F41 X-CRM114-Status: GOOD ( 23.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Yongqiang Niu Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 2021-04-12 at 16:28 +0800, CK Hu wrote: > Hi, Yongqiang: > > On Mon, 2021-04-12 at 14:35 +0800, Yongqiang Niu wrote: > > gamma lut set in vsync active will caused display flash issue > > set gamma lut with cmdq > > In MT8173, it's ok to set gammma out of vblank period. Why do you > setting gamma in vblank in this patch? > > Regards, > CK > mtk drm driver code has changed many since mt8173, there is no one test this in the newest version for mt8173. and this issue is random. https://partnerissuetracker.corp.google.com/u/1/issues/153842418 and not all platform will set gamma lut. some project platform will not set gamma lut from chrome os (crhome os set gamma lut may be with some special panel, like AUO B116XTN02.3 in https://partnerissuetracker.corp.google.com/u/1/issues/153842418 ) > > > > Signed-off-by: Yongqiang Niu > > --- > > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 4 ++-- > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 7 ++++--- > > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 11 ++++++----- > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 +++++++++++------- > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 8 +++++--- > > 5 files changed, 28 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > index 64b4528..c8e178e 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > @@ -59,12 +59,12 @@ void mtk_aal_config(struct device *dev, unsigned int w, > > mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE); > > } > > > > -void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state, struct cmdq_pkt *cmdq_pkt) > > { > > struct mtk_disp_aal *aal = dev_get_drvdata(dev); > > > > if (aal->data && aal->data->has_gamma) > > - mtk_gamma_set_common(aal->regs, state); > > + mtk_gamma_set_common(aal->regs, &aal->cmdq_reg, state, cmdq_pkt); > > } > > > > void mtk_aal_start(struct device *dev) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > index 86c3068..c2e7dcb 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > @@ -14,7 +14,7 @@ > > void mtk_aal_config(struct device *dev, unsigned int w, > > unsigned int h, unsigned int vrefresh, > > unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > > -void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state); > > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state, struct cmdq_pkt *cmdq_pkt); > > void mtk_aal_start(struct device *dev); > > void mtk_aal_stop(struct device *dev); > > > > @@ -50,8 +50,9 @@ void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg, > > void mtk_gamma_config(struct device *dev, unsigned int w, > > unsigned int h, unsigned int vrefresh, > > unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > > -void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state); > > -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state); > > +void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state, struct cmdq_pkt *cmdq_pkt); > > +void mtk_gamma_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg, > > + struct drm_crtc_state *state, struct cmdq_pkt *cmdq_pkt); > > void mtk_gamma_start(struct device *dev); > > void mtk_gamma_stop(struct device *dev); > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > index 3ebf91e..99a4ff3 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > @@ -55,7 +55,8 @@ void mtk_gamma_clk_disable(struct device *dev) > > clk_disable_unprepare(gamma->clk); > > } > > > > -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state) > > +void mtk_gamma_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg, > > + struct drm_crtc_state *state, struct cmdq_pkt *cmdq_pkt) > > { > > unsigned int i, reg; > > struct drm_color_lut *lut; > > @@ -65,23 +66,23 @@ void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state) > > if (state->gamma_lut) { > > reg = readl(regs + DISP_GAMMA_CFG); > > reg = reg | GAMMA_LUT_EN; > > - writel(reg, regs + DISP_GAMMA_CFG); > > + mtk_ddp_write(cmdq_pkt, reg, cmdq_reg, regs, DISP_GAMMA_CFG); > > lut_base = regs + DISP_GAMMA_LUT; > > lut = (struct drm_color_lut *)state->gamma_lut->data; > > for (i = 0; i < MTK_LUT_SIZE; i++) { > > word = (((lut[i].red >> 6) & LUT_10BIT_MASK) << 20) + > > (((lut[i].green >> 6) & LUT_10BIT_MASK) << 10) + > > ((lut[i].blue >> 6) & LUT_10BIT_MASK); > > - writel(word, (lut_base + i * 4)); > > + mtk_ddp_write(cmdq_pkt, word, cmdq_reg, regs, (lut_base + i * 4)); > > } > > } > > } > > > > -void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) > > +void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state, struct cmdq_pkt *cmdq_pkt) > > { > > struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > > > > - mtk_gamma_set_common(gamma->regs, state); > > + mtk_gamma_set_common(gamma->regs, &gamma->cmdq_reg, state, cmdq_pkt); > > } > > > > void mtk_gamma_config(struct device *dev, unsigned int w, > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > index 8b0de90..73428f0 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > @@ -423,6 +423,15 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, > > } > > mtk_crtc->pending_async_planes = false; > > } > > + > > + if (crtc->state->color_mgmt_changed) { > > + int i; > > + > > + for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) { > > + mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc->state, cmdq_handle); > > + mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc->state); > > + } > > + } > > } > > > > static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) > > @@ -464,7 +473,7 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) > > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > > if (mtk_crtc->cmdq_client) { > > mbox_flush(mtk_crtc->cmdq_client->chan, 2000); > > - cmdq_handle = cmdq_pkt_create(mtk_crtc->cmdq_client, PAGE_SIZE); > > + cmdq_handle = cmdq_pkt_create(mtk_crtc->cmdq_client, 2 * PAGE_SIZE); > > cmdq_pkt_clear_event(cmdq_handle, mtk_crtc->cmdq_event); > > cmdq_pkt_wfe(cmdq_handle, mtk_crtc->cmdq_event, false); > > mtk_crtc_ddp_config(crtc, cmdq_handle); > > @@ -616,15 +625,10 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc, > > struct drm_atomic_state *state) > > { > > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > > - int i; > > > > if (mtk_crtc->event) > > mtk_crtc->pending_needs_vblank = true; > > - if (crtc->state->color_mgmt_changed) > > - for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) { > > - mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc->state); > > - mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc->state); > > - } > > + > > mtk_drm_crtc_hw_config(mtk_crtc); > > } > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > index bb914d9..bffa58d 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > @@ -60,7 +60,8 @@ struct mtk_ddp_comp_funcs { > > struct mtk_plane_state *state, > > struct cmdq_pkt *cmdq_pkt); > > void (*gamma_set)(struct device *dev, > > - struct drm_crtc_state *state); > > + struct drm_crtc_state *state, > > + struct cmdq_pkt *cmdq_pkt); > > void (*bgclr_in_on)(struct device *dev); > > void (*bgclr_in_off)(struct device *dev); > > void (*ctm_set)(struct device *dev, > > @@ -160,10 +161,11 @@ static inline void mtk_ddp_comp_layer_config(struct mtk_ddp_comp *comp, > > } > > > > static inline void mtk_ddp_gamma_set(struct mtk_ddp_comp *comp, > > - struct drm_crtc_state *state) > > + struct drm_crtc_state *state, > > + struct cmdq_pkt *cmdq_pkt) > > { > > if (comp->funcs && comp->funcs->gamma_set) > > - comp->funcs->gamma_set(comp->dev, state); > > + comp->funcs->gamma_set(comp->dev, state, cmdq_pkt); > > } > > > > static inline void mtk_ddp_comp_bgclr_in_on(struct mtk_ddp_comp *comp) > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel