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 76370C6FA86 for ; Wed, 14 Sep 2022 01:48:01 +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=T46sIRJ3saTliKRXlOESWMRzam6lsRq3rjMdS8BGpvQ=; b=m2OFPptteLwbkl sF4WTUVVEdpGdLi7RsUzq2Fw5K17VdY4u1cueVxl3oj1T3inx5ND23ET+3p98OiFGBajWIXypYTYi 6gQmfj3CEz5tUVo5kR/KSLP1UkK0+kXQ1rzY+gtkZCjWfWpy13aXpEXjul8kU6F5Vwv45Jx3LkkmZ GEhvd70QyqB6Pi32OWkweH8TIa7RYm1zulNQS5ZlBJjw5BQEetNw9V8osk2Ht6b35IsrzzwzcZ0kw qGt4MAKf735U14vGQHZ74y3RST7KWUmEOAYxdlN3l0YibcMeyAgNDSYO4jxePgllYcCJUwA8LVRUg HVg7UF4vfMHYm/OQF5zQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oYHUB-003pGK-AD; Wed, 14 Sep 2022 01:46:43 +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 1oYHU7-003pDG-Qq; Wed, 14 Sep 2022 01:46:41 +0000 X-UUID: e7b9203e05f34ccba6bc6fac351efb91-20220913 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=mSDfnV9Y8FokxfoaGAcr1iQVtsA9X7BYTGuDMzLt1yo=; b=u6kH5y1fb/rxMAY08rm5Y3VcmDWR0NhtUadKeoLrVe2ufhWnxn15Q/7NV9oRiHetnkRLeljAtrvFtOcL2WDmUaXU4eLFNhLdxI14Y5BDZ5vFEQnn0AT+eLgnCctcarKgofQdobIbIn6mjiIbgbIP75Ol28euf2KrZImyZ3HlsW8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:19ef92a3-ac29-4666-bd9e-698b6d1e3b2b,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:39a5ff1,CLOUDID:607a8c5d-5ed4-4e28-8b00-66ed9f042fbd,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: e7b9203e05f34ccba6bc6fac351efb91-20220913 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1005540730; Tue, 13 Sep 2022 18:46:33 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Wed, 14 Sep 2022 09:35:58 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Wed, 14 Sep 2022 09:35:58 +0800 Message-ID: Subject: Re: [PATCH v3 4/9] drm/mediatek: Add gamma support different lut_size for other SoC From: Jason-JH Lin To: AngeloGioacchino Del Regno , Chun-Kuang Hu , Rob Herring , Krzysztof Kozlowski , Matthias Brugger CC: CK Hu , Rex-BC Chen , "Singo Chang" , , , , , , Date: Wed, 14 Sep 2022 09:35:58 +0800 In-Reply-To: <97ac2b35-bb3b-360a-4078-f72146136a7f@collabora.com> References: <20220911153734.24243-1-jason-jh.lin@mediatek.com> <20220911153734.24243-5-jason-jh.lin@mediatek.com> <97ac2b35-bb3b-360a-4078-f72146136a7f@collabora.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-20220913_184640_027140_46657465 X-CRM114-Status: GOOD ( 24.78 ) 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 Angelo, Thanks for the reviews. On Mon, 2022-09-12 at 12:24 +0200, AngeloGioacchino Del Regno wrote: > Il 11/09/22 17:37, Jason-JH.Lin ha scritto: > > 1. Add mtk_drm_gamma_get_lut_size() and remove MTK_LUT_SIZE macro. > > 2. Add lut_size to gamma driver data for different SoC. > > > > Signed-off-by: Jason-JH.Lin > > --- > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 1 + > > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 22 > > +++++++++++++++++++-- > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 4 ++-- > > drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 - > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 9 +++++++++ > > 5 files changed, 32 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > index a83e5fbc8724..6a05bb56e693 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > @@ -51,6 +51,7 @@ void mtk_gamma_clk_disable(struct device *dev); > > void mtk_gamma_config(struct device *dev, unsigned int w, > > unsigned int h, unsigned int vrefresh, > > unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > > +unsigned int mtk_gamma_get_lut_size(struct device *dev); > > void mtk_gamma_set(struct device *dev, struct drm_crtc_state > > *state); > > void mtk_gamma_set_common(struct device *dev, void __iomem *regs, > > struct drm_crtc_state *state); > > void mtk_gamma_start(struct device *dev); > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > index f54a6a618348..e69d0b205b9a 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > @@ -24,10 +24,12 @@ > > #define DISP_GAMMA_LUT 0x0700 > > > > #define LUT_10BIT_MASK 0x03ff > > +#define LUT_SIZE_DEFAULT 512 /* for setting > > gamma lut from AAL */ > > > > struct mtk_disp_gamma_data { > > bool has_dither; > > bool lut_diff; > > + u16 lut_size; > > }; > > > > /* > > @@ -54,18 +56,32 @@ void mtk_gamma_clk_disable(struct device *dev) > > clk_disable_unprepare(gamma->clk); > > } > > > > +unsigned int mtk_gamma_get_size(struct device *dev) > > +{ > > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > > + unsigned int lut_size = LUT_SIZE_DEFAULT; > > + > > + if (gamma && gamma->data) > > + lut_size = gamma->data->lut_size; > > + > > + return lut_size; > > +} > > + > > void mtk_gamma_set_common(struct device *dev, void __iomem *regs, > > struct drm_crtc_state *state) > > { > > struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > > bool lut_diff = false; > > + u16 lut_size = LUT_SIZE_DEFAULT; > > This makes us get a double assignment in case gamma->data is > populated. > > > unsigned int i, reg; > > struct drm_color_lut *lut; > > void __iomem *lut_base; > > u32 word; > > u32 diff[3] = {0}; > > > > - if (gamma && gamma->data) > > + if (gamma && gamma->data) { > > lut_diff = gamma->data->lut_diff; > > + lut_size = gamma->data->lut_size; > > + } > > ...you can avoid it like that: > > } else { > lut_size = LUT_SIZE_DEFAULT; > } > > > Regards, > Angelo > OK, I'll fix it, but I'll move the gamma priv data handling to the mtk_gamma_set. Regards, Jason-JH.Lin > -- Jason-JH Lin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel