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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98B07C433FE for ; Tue, 26 Apr 2022 01:58:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241633AbiDZCBo (ORCPT ); Mon, 25 Apr 2022 22:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229834AbiDZCBn (ORCPT ); Mon, 25 Apr 2022 22:01:43 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 635247F213; Mon, 25 Apr 2022 18:58:32 -0700 (PDT) X-UUID: 9195ffa0bb584458bdb89e262764789c-20220426 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4,REQID:65318cd4-b088-48af-9168-170ab149b110,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:faefae9,CLOUDID:7be916f0-06b0-4305-bfbf-554bfc9d151a,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: 9195ffa0bb584458bdb89e262764789c-20220426 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1969511146; Tue, 26 Apr 2022 09:58:27 +0800 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 26 Apr 2022 09:58:26 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Apr 2022 09:58:25 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Apr 2022 09:58:24 +0800 Message-ID: Subject: Re: [PATCH v1, 1/1] drm/mediatek: add lut diff flag for new gamma hardware support From: CK Hu To: Yongqiang Niu , 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 09:58:24 +0800 In-Reply-To: <20220420130617.814-2-yongqiang.niu@mediatek.com> References: <20220420130617.814-1-yongqiang.niu@mediatek.com> <20220420130617.814-2-yongqiang.niu@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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] How does hardware know that this is increase lut or decrease lut? > 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? > > 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); 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); 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6F03BC433EF for ; Tue, 26 Apr 2022 01:58:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA94E10E17E; Tue, 26 Apr 2022 01:58:35 +0000 (UTC) Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by gabe.freedesktop.org (Postfix) with ESMTPS id 630F810E17E for ; Tue, 26 Apr 2022 01:58:33 +0000 (UTC) X-UUID: 9195ffa0bb584458bdb89e262764789c-20220426 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4, REQID:65318cd4-b088-48af-9168-170ab149b110, OB:0, LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:faefae9, CLOUDID:7be916f0-06b0-4305-bfbf-554bfc9d151a, C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: 9195ffa0bb584458bdb89e262764789c-20220426 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1969511146; Tue, 26 Apr 2022 09:58:27 +0800 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 26 Apr 2022 09:58:26 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Apr 2022 09:58:25 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Apr 2022 09:58:24 +0800 Message-ID: Subject: Re: [PATCH v1, 1/1] drm/mediatek: add lut diff flag for new gamma hardware support From: CK Hu To: Yongqiang Niu , Chun-Kuang Hu Date: Tue, 26 Apr 2022 09:58:24 +0800 In-Reply-To: <20220420130617.814-2-yongqiang.niu@mediatek.com> References: <20220420130617.814-1-yongqiang.niu@mediatek.com> <20220420130617.814-2-yongqiang.niu@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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: Yongqiang Niu , devicetree@vger.kernel.org, David Airlie , Dennis YC Hsieh , Jassi Brar , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Project_Global_Chrome_Upstream_Group@mediatek.com, Fabien Parent , Rob Herring , linux-mediatek@lists.infradead.org, Hsin-Yi Wang , Matthias Brugger , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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] How does hardware know that this is increase lut or decrease lut? > 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? > > 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); 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); 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 14C57C433EF for ; Tue, 26 Apr 2022 01:58:57 +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=nASj8qXEa3Q7K45Yps0hPfEvKsuiyrkjJhn8XyKVfok=; b=it7ZPuXbrF9z9T eLPROfNVmIsQd/kxxz1hi+fTlSV5MWWR5n2g/ZeWtYQxig8Tytj3v9eSZRvc66lzqzIGcxJeXC+kU isOnlWfJ0Ma360jQGKx9ySSdZe8oU9quGQSBFBVEbJ1rhY1aItX16rhamUXiiDAZyyEMFXgRMxt0G hGQ87ZKtfWtqavODiBFstcLoxcJEgQ0LPYLtMvoqszmi8h1jDOfmHcUTb/YQxcG386OZijx6QyJam jkeo0z4ZSjPS5qZmJHLfBK+fmXHtYfJNUZ6TtqkbaRXteCOnq8Zr+9mIbLz9b8na1oT632DCcIC3O tnbzWKYy4z2zgjvea5WQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njATZ-00C846-Di; Tue, 26 Apr 2022 01:58:49 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njATM-00C80S-8c; Tue, 26 Apr 2022 01:58:39 +0000 X-UUID: 4f075b50f4784ee7a815057a576fdaef-20220425 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4, REQID:f0844129-3316-46c0-8731-212f68dc970f, OB:0, LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:faefae9, CLOUDID:f7dcecf0-da02-41b4-b6df-58f4ccd36682, C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: 4f075b50f4784ee7a815057a576fdaef-20220425 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1018130097; Mon, 25 Apr 2022 18:58:29 -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 18:58:27 -0700 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Apr 2022 09:58:25 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Apr 2022 09:58:24 +0800 Message-ID: Subject: Re: [PATCH v1, 1/1] drm/mediatek: add lut diff flag for new gamma hardware support From: CK Hu To: Yongqiang Niu , 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 09:58:24 +0800 In-Reply-To: <20220420130617.814-2-yongqiang.niu@mediatek.com> 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_185836_364912_5DFDA387 X-CRM114-Status: GOOD ( 28.96 ) 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 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] How does hardware know that this is increase lut or decrease lut? > 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? > > 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); 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 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 EC68FC433EF for ; Tue, 26 Apr 2022 02:00:05 +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=vgJ6Lg635FcSn9d5ML9UwQqtTAEHZA+R5dz+jbRbR2o=; b=CBH3YG581Mr9qy wy4RFmcefFYhvtWZvuL0RotTVh0HIFmi6x5KP9UAITfJ1up+ODsSTRbgevytiOcs8qxBGUBoQWIsg nqEt3utM3Sr1CednVtlywLzWDHpzcCxjvgtmT4wmt1ihXPWaB8J7+3C1ZsIvetiX5mFS4tXvGWcAo psw0ZXSu882SqkVkcZmKAIUBBbJr4XSvyFOtDhxbe/XLxf2lY4AWNfyuZrCSbTJa4lOoMZBic3MUm wCVGzP/v4JUlSWMit/s/tx2ekpesCsBEf0vmU9Ei+rEY/UnpbGEoeoM3Im/zaQgMTQ0UfcGuRVC8X kGssnGHqH575rl56sU8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1njATR-00C81U-5n; Tue, 26 Apr 2022 01:58:41 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1njATM-00C80S-8c; Tue, 26 Apr 2022 01:58:39 +0000 X-UUID: 4f075b50f4784ee7a815057a576fdaef-20220425 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4, REQID:f0844129-3316-46c0-8731-212f68dc970f, OB:0, LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:faefae9, CLOUDID:f7dcecf0-da02-41b4-b6df-58f4ccd36682, C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: 4f075b50f4784ee7a815057a576fdaef-20220425 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1018130097; Mon, 25 Apr 2022 18:58:29 -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 18:58:27 -0700 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Apr 2022 09:58:25 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Apr 2022 09:58:24 +0800 Message-ID: Subject: Re: [PATCH v1, 1/1] drm/mediatek: add lut diff flag for new gamma hardware support From: CK Hu To: Yongqiang Niu , 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 09:58:24 +0800 In-Reply-To: <20220420130617.814-2-yongqiang.niu@mediatek.com> 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_185836_364912_5DFDA387 X-CRM114-Status: GOOD ( 28.96 ) 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: , 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 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] How does hardware know that this is increase lut or decrease lut? > 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? > > 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); 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-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel