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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB5C8C433F5 for ; Tue, 26 Apr 2022 02:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type: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:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o+IV+fPKbWbAJmppZ7Pc1Gxtt2X6bs1aE6p8ZjVTf/E=; b=tV3KVnztnRsDoQ ab7cyp5Yz58tqQ/RgwV7LLc98U1rqeDKxJotYcK5L+mEIYRNMdfQmzgrv+NJGzcJVsAnsbINv25Uv MP2vx5f+kAwOYGNcf+FIexsUqtG7g3F080kweEcSYSnnc/IyF26LZ0tTve/DvZPBt3bmVjo3TvEF+ JOc4ARJlhxNYEAQTmfET7hrt6OkINGAjbWV5HWRupeAyw8tEDgS5UDitdL0cvB1T5WnfTIDCQK9l/ z3C247NIZ/OWuHWMXDNcYWs821DgL1vtOWFgX+t1Te0br3/yv75p5kIlkIgBG9WOtVfu0QNskgr4Y TpU6WZ4RtT3getgS6fZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njBGx-00CEQr-Pq; Tue, 26 Apr 2022 02:49:51 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njBGm-00CEOG-Ak; Tue, 26 Apr 2022 02:49:42 +0000 X-UUID: 183f306407d04d5195fbae54de7d36f3-20220425 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=JxOhV/4DjcO2mhvn2jiLuFW6cALEAGnMz9VqUKUoMCs=; b=tnKoplnp7HAp9sRQj/7bF0Na/7QROaZ3cGcq0c36gvfI6zbqNwq+BRXVA0zAMsLtWBxyNTwk4sEqZrznk4I1XWDxVsikgJuMSKQJWDc8wA1wRZEYGDfNgfczs4pDPRxvISRk6q9onaBQA8IAmsAvvxVUd/YJf29VPOW2eOkV5LE=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4, REQID:588b5b4e-173a-4a9b-a58c-1a1e73efad94, OB:0, LO B:0,IP:0,URL:0,TC:0,Content:7,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:7 X-CID-META: VersionHash:faefae9, CLOUDID:2218eff0-da02-41b4-b6df-58f4ccd36682, C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:4,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: 183f306407d04d5195fbae54de7d36f3-20220425 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 1432133990; Mon, 25 Apr 2022 19:49:34 -0700 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 25 Apr 2022 19:39:32 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Apr 2022 10:39:31 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Apr 2022 10:39:29 +0800 Message-ID: <48f4a8d3d447342eb952598d479028586caacedc.camel@mediatek.com> Subject: Re: [PATCH v1, 1/1] drm/mediatek: add lut diff flag for new gamma hardware support From: yongqiang.niu To: CK Hu , Chun-Kuang Hu CC: Yongqiang Niu , , , David Airlie , Jassi Brar , , , "Dennis YC Hsieh" , Fabien Parent , Rob Herring , , Hsin-Yi Wang , Matthias Brugger , Date: Tue, 26 Apr 2022 10:39:29 +0800 In-Reply-To: References: <20220420130617.814-1-yongqiang.niu@mediatek.com> <20220420130617.814-2-yongqiang.niu@mediatek.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220425_194940_423645_CB2C3171 X-CRM114-Status: GOOD ( 35.29 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Tue, 2022-04-26 at 09:58 +0800, CK Hu wrote: > Hi, Yongqiang: > > On Wed, 2022-04-20 at 21:06 +0800, Yongqiang Niu wrote: > > From: Yongqiang Niu > > > > > > mt8183 gamma module usage is different with before soc, > > gamma odd(index start from 0) lut value set to hardware > > register should be > > the difference of current lut value with last lut value. > > > > gamma function support both increase and decrease lut. > > How to set decrease lut? > > Original lut: > 12 10 8 6 4 2 > > Does diff lut look like this? > 12 [2] 8 [2] 4 [2] > yes > How does hardware know that this is increase lut or decrease lut? gamma register 0x20 , bit 2, if this bit set to 1, hardware will know lut is decrease. this bit default is 0, that means lut is increase > > > chrome os app set increase lut normally. > > > > for increase lut example, chrome os user space set lut > > like this(only r chanel for example): > > 2 4 6 8 10 12. > > 1) mt8183 gamma driver should set the gamma lut to hardware > > register like this: > > 2 [2] 6 [8] 10 [2] > > 2 [2] 6 [2] 10 [2] > > > the value with [] is the difference value > > 2) gamma hardware will restore the lut when apply gamma > > function to display > > I don't know why do you mention the 'restore', any modification is > related to this? > that means gamma hardware process display data with original lut > > > > Signed-off-by: Yongqiang Niu < > > yongqiang.niu@mediatek.corp-partner.google.com> > > --- > > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 4 ++- > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- > > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 34 +++++++++++++++++++ > > ---- > > 3 files changed, 32 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > index f46d4ab73d6a..e6378b074a17 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > @@ -23,6 +23,7 @@ > > > > struct mtk_disp_aal_data { > > bool has_gamma; > > + bool lut_diff; > > }; > > > > /** > > @@ -66,7 +67,7 @@ void mtk_aal_gamma_set(struct device *dev, struct > > drm_crtc_state *state) > > 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, state, aal->data- > > > lut_diff); > > gamma in aal does not support diff lut, so this would make things > simple. > > mtk_gamma_set_common(aal->regs, state, false); fix next version > > Regards, > CK > > > } > > > > void mtk_aal_start(struct device *dev) > > @@ -148,6 +149,7 @@ static int mtk_disp_aal_remove(struct > > platform_device *pdev) > > > > static const struct mtk_disp_aal_data mt8173_aal_driver_data = { > > .has_gamma = true, > > + .lut_diff = false, > > }; > > > > static const struct of_device_id mtk_disp_aal_driver_dt_match[] = > > { > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > index 86c3068894b1..3380651c6707 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > @@ -51,7 +51,7 @@ 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_common(void __iomem *regs, struct > > drm_crtc_state > > *state, bool lut_diff); > > 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 3a5815ab4079..fec2e9a5b60d 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > @@ -27,6 +27,7 @@ > > > > struct mtk_disp_gamma_data { > > bool has_dither; > > + bool lut_diff; > > }; > > > > /* > > @@ -53,12 +54,13 @@ 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 > > drm_crtc_state > > *state, bool lut_diff) > > { > > unsigned int i, reg; > > struct drm_color_lut *lut; > > void __iomem *lut_base; > > u32 word; > > + u32 diff[3] = {0}; > > > > if (state->gamma_lut) { > > reg = readl(regs + DISP_GAMMA_CFG); > > @@ -67,9 +69,20 @@ void mtk_gamma_set_common(void __iomem *regs, > > struct drm_crtc_state *state) > > 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); > > + > > + if (!lut_diff || (i % 2 == 0)) { > > + word = (((lut[i].red >> 6) & > > LUT_10BIT_MASK) << 20) + > > + (((lut[i].green >> 6) & > > LUT_10BIT_MASK) << 10) + > > + ((lut[i].blue >> 6) & > > LUT_10BIT_MASK); > > + } else { > > + diff[0] = abs((lut[i].red >> 6) - > > (lut[i - 1].red >> 6)); > > + diff[1] = abs((lut[i].green >> 6) - > > (lut[i - 1].green >> 6)); > > + diff[2] = abs((lut[i].blue >> 6) - > > (lut[i - 1].blue >> 6)); > > + > > + word = ((diff[0] & LUT_10BIT_MASK) << > > 20) + > > + ((diff[1] & LUT_10BIT_MASK) << > > 10) + > > + (diff[2] & LUT_10BIT_MASK); > > + } > > writel(word, (lut_base + i * 4)); > > } > > } > > @@ -78,8 +91,12 @@ 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 mtk_disp_gamma *gamma = dev_get_drvdata(dev); > > + bool lut_diff = false; > > + > > + if (gamma->data) > > + lut_diff = gamma->data->lut_diff; > > > > - mtk_gamma_set_common(gamma->regs, state); > > + mtk_gamma_set_common(gamma->regs, state, lut_diff); > > } > > > > void mtk_gamma_config(struct device *dev, unsigned int w, > > @@ -176,10 +193,15 @@ static const struct mtk_disp_gamma_data > > mt8173_gamma_driver_data = { > > .has_dither = true, > > }; > > > > +static const struct mtk_disp_gamma_data mt8183_gamma_driver_data = > > { > > + .lut_diff = true, > > +}; > > + > > static const struct of_device_id mtk_disp_gamma_driver_dt_match[] > > = > > { > > { .compatible = "mediatek,mt8173-disp-gamma", > > .data = &mt8173_gamma_driver_data}, > > - { .compatible = "mediatek,mt8183-disp-gamma"}, > > + { .compatible = "mediatek,mt8183-disp-gamma", > > + .data = &mt8183_gamma_driver_data}, > > {}, > > }; > > MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match); > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek