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=-12.7 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, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 69A10C433E0 for ; Thu, 28 Jan 2021 05:34:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 B8A4760C40 for ; Thu, 28 Jan 2021 05:34:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8A4760C40 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-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date: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=Mc5Yn/MhsKxKzGjrZ5IekM8V/cwlJ6hGSdftkRTLK8E=; b=lUrvq4XLPp27WaEs7Y73h2njm SGnJueHzdAd962T6YPy3NLXSfl302Pk5YPAcA3FU/DxicBKZEec3An5j5Ot2B00/9DGGjv4GQr523 bgbhtICDnkdQmsp7sNLa9ExqqmxjvQLUa1delBROU8JQSwdXgW/N4yRWTJJbmxLnwJMp9UehB2vDc sHSD+sk/uu41iM/A+jrB4dWyiYOCzyV9YLttQChzzrAL+fIkop0iTyIaWxw+2GTTaKuzNC3avzidf dolceJYU7OM3QvJOzkezZ37Iy5/ztyzW+VvKabjY3cQQi8C0lSSB0JvEooDSM4dA8JevLVel2ytY3 BujDdhPkQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4zwW-000712-BG; Thu, 28 Jan 2021 05:34:08 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4zwT-00070Y-M2; Thu, 28 Jan 2021 05:34:07 +0000 X-UUID: f4036ff12ac14332b3b14b2a52faed1e-20210127 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=YE9IqQ50ZpT8YURQ2js2UPrxNnQWoNPjEPrZqWAPV1w=; b=mUMqjWvFBSO4OiRXQg/8ErdgRbbM0nLF0lZ0unpT845VliYTK1QVt9uyUvGH6sJ07xuY7HXpWRwvLkaStKd+Nr7hSqtGL7Kuw2aan6cMdF3Th6tRfrOSznCNoeCtYbP79bTnmKjKPcRgnkAVJflf9MXSzAHxX95PWgsa8E7C0gg=; X-UUID: f4036ff12ac14332b3b14b2a52faed1e-20210127 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 680878475; Wed, 27 Jan 2021 21:34:01 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 27 Jan 2021 21:33:59 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 28 Jan 2021 13:33:52 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 28 Jan 2021 13:33:52 +0800 Message-ID: <1611812032.28312.0.camel@mtksdaap41> Subject: Re: [PATCH v10 5/9] drm/mediatek: separate gamma module From: CK Hu To: Hsin-Yi Wang Date: Thu, 28 Jan 2021 13:33:52 +0800 In-Reply-To: <20210127045422.2418917-6-hsinyi@chromium.org> References: <20210127045422.2418917-1-hsinyi@chromium.org> <20210127045422.2418917-6-hsinyi@chromium.org> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: F7372C9677493752AB582EA8CAA11D72DB6212585926DC666EBD13B8797F14AD2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210128_003405_997727_8208F1A0 X-CRM114-Status: GOOD ( 29.29 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Philipp Zabel , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Yongqiang Niu , Project_Global_Chrome_Upstream_Group@mediatek.com, linux-mediatek@lists.infradead.org, Daniel Vetter , Matthias Brugger , linux-arm-kernel@lists.infradead.org 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, Hsin-Yi: On Wed, 2021-01-27 at 12:54 +0800, Hsin-Yi Wang wrote: > From: Yongqiang Niu > > mt8183 gamma module will different with mt8173 > separate gamma for add private data Reviewed-by: CK Hu > > Signed-off-by: Yongqiang Niu > Signed-off-by: Hsin-Yi Wang > --- > drivers/gpu/drm/mediatek/Makefile | 1 + > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 10 ++ > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 188 ++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 71 ++------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 214 insertions(+), 61 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index 01d06332f7679..b64674b944860 100644 > --- a/drivers/gpu/drm/mediatek/Makefile > +++ b/drivers/gpu/drm/mediatek/Makefile > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > > mediatek-drm-y := mtk_disp_color.o \ > + mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > mtk_disp_rdma.o \ > mtk_drm_crtc.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index c50d5fc9fd349..c1e658b490b6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -27,6 +27,16 @@ void mtk_dpi_stop(struct device *dev); > void mtk_dsi_ddp_start(struct device *dev); > void mtk_dsi_ddp_stop(struct device *dev); > > +int mtk_gamma_clk_enable(struct device *dev); > +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); > +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_start(struct device *dev); > +void mtk_gamma_stop(struct device *dev); > + > void mtk_ovl_bgclr_in_on(struct device *dev); > void mtk_ovl_bgclr_in_off(struct device *dev); > void mtk_ovl_bypass_shadow(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > new file mode 100644 > index 0000000000000..b5a499d7e472c > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -0,0 +1,188 @@ > +/* > + * SPDX-License-Identifier: > + * > + * Copyright (c) 2020 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_GAMMA_EN 0x0000 > +#define GAMMA_EN BIT(0) > +#define DISP_GAMMA_CFG 0x0020 > +#define GAMMA_LUT_EN BIT(1) > +#define DISP_GAMMA_SIZE 0x0030 > +#define DISP_GAMMA_LUT 0x0700 > + > +#define LUT_10BIT_MASK 0x03ff > + > +struct mtk_disp_gamma_data { > + u32 reserved; > +}; > + > +/** > + * struct mtk_disp_gamma - DISP_GAMMA driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_gamma { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_gamma_data *data; > +}; > + > +int mtk_gamma_clk_enable(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + return clk_prepare_enable(gamma->clk); > +} > + > +void mtk_gamma_clk_disable(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + clk_disable_unprepare(gamma->clk); > +} > + > +void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state) > +{ > + unsigned int i, reg; > + struct drm_color_lut *lut; > + void __iomem *lut_base; > + u32 word; > + > + if (state->gamma_lut) { > + reg = readl(regs + DISP_GAMMA_CFG); > + reg = reg | GAMMA_LUT_EN; > + writel(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)); > + } > + } > +} > + > +void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + mtk_gamma_set_common(gamma->regs, state); > +} > + > +void mtk_gamma_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, h << 16 | w, &gamma->cmdq_reg, gamma->regs, > + DISP_GAMMA_SIZE); > + mtk_dither_set_common(gamma->regs, &gamma->cmdq_reg, bpc, DISP_GAMMA_CFG, cmdq_pkt); > +} > + > +void mtk_gamma_start(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + writel(GAMMA_EN, gamma->regs + DISP_GAMMA_EN); > +} > + > +void mtk_gamma_stop(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, gamma->regs + DISP_GAMMA_EN); > +} > + > +static int mtk_disp_gamma_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_gamma_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_gamma_component_ops = { > + .bind = mtk_disp_gamma_bind, > + .unbind = mtk_disp_gamma_unbind, > +}; > + > +static int mtk_disp_gamma_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_gamma *priv; > + struct resource *res; > + int ret; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->clk = devm_clk_get(dev, NULL); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "failed to get gamma clk\n"); > + return PTR_ERR(priv->clk); > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + priv->regs = devm_ioremap_resource(dev, res); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "failed to ioremap gamma\n"); > + return PTR_ERR(priv->regs); > + } > + > +#if IS_REACHABLE(CONFIG_MTK_CMDQ) > + ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > + if (ret) > + dev_dbg(dev, "get mediatek,gce-client-reg fail!\n"); > +#endif > + > + priv->data = of_device_get_match_data(dev); > + platform_set_drvdata(pdev, priv); > + > + ret = component_add(dev, &mtk_disp_gamma_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_gamma_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_gamma_component_ops); > + > + return 0; > +} > + > +static const struct of_device_id mtk_disp_gamma_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-gamma"}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match); > + > +struct platform_driver mtk_disp_gamma_driver = { > + .probe = mtk_disp_gamma_probe, > + .remove = mtk_disp_gamma_remove, > + .driver = { > + .name = "mediatek-disp-gamma", > + .owner = THIS_MODULE, > + .of_match_table = mtk_disp_gamma_driver_dt_match, > + }, > +}; > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 53d25823a37cc..8173f709272be 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -55,11 +55,6 @@ > #define DITHER_RELAY_MODE BIT(0) > #define DISP_DITHER_SIZE 0x0030 > > -#define DISP_GAMMA_EN 0x0000 > -#define DISP_GAMMA_CFG 0x0020 > -#define DISP_GAMMA_SIZE 0x0030 > -#define DISP_GAMMA_LUT 0x0700 > - > #define LUT_10BIT_MASK 0x03ff > > #define OD_RELAYMODE BIT(0) > @@ -68,9 +63,6 @@ > > #define AAL_EN BIT(0) > > -#define GAMMA_EN BIT(0) > -#define GAMMA_LUT_EN BIT(1) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -151,7 +143,6 @@ static void mtk_ddp_clk_disable(struct device *dev) > clk_disable_unprepare(priv->clk); > } > > - > void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg, > unsigned int bpc, unsigned int CFG, struct cmdq_pkt *cmdq_pkt) > { > @@ -219,6 +210,13 @@ static void mtk_aal_config(struct device *dev, unsigned int w, > mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE); > } > > +static void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > + > + mtk_gamma_set_common(priv->regs, state); > +} > + > static void mtk_aal_start(struct device *dev) > { > struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > @@ -333,58 +331,10 @@ static void mtk_dither_stop(struct device *dev) > writel_relaxed(0x0, priv->regs + DISP_DITHER_EN); > } > > -static void mtk_gamma_config(struct device *dev, unsigned int w, > - unsigned int h, unsigned int vrefresh, > - unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - mtk_ddp_write(cmdq_pkt, h << 16 | w, &priv->cmdq_reg, priv->regs, DISP_GAMMA_SIZE); > - mtk_dither_set(dev, bpc, DISP_GAMMA_CFG, cmdq_pkt); > -} > - > -static void mtk_gamma_start(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel(GAMMA_EN, priv->regs + DISP_GAMMA_EN); > -} > - > -static void mtk_gamma_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_GAMMA_EN); > -} > - > -static void mtk_gamma_set(struct device *dev, > - struct drm_crtc_state *state) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - unsigned int i, reg; > - struct drm_color_lut *lut; > - void __iomem *lut_base; > - u32 word; > - > - if (state->gamma_lut) { > - reg = readl(priv->regs + DISP_GAMMA_CFG); > - reg = reg | GAMMA_LUT_EN; > - writel(reg, priv->regs + DISP_GAMMA_CFG); > - lut_base = priv->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)); > - } > - } > -} > - > static const struct mtk_ddp_comp_funcs ddp_aal = { > .clk_enable = mtk_ddp_clk_enable, > .clk_disable = mtk_ddp_clk_disable, > - .gamma_set = mtk_gamma_set, > + .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > .stop = mtk_aal_stop, > @@ -425,8 +375,8 @@ static const struct mtk_ddp_comp_funcs ddp_dsi = { > }; > > static const struct mtk_ddp_comp_funcs ddp_gamma = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_gamma_clk_enable, > + .clk_disable = mtk_gamma_clk_disable, > .gamma_set = mtk_gamma_set, > .config = mtk_gamma_config, > .start = mtk_gamma_start, > @@ -642,6 +592,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, > > if (type == MTK_DISP_BLS || > type == MTK_DISP_COLOR || > + type == MTK_DISP_GAMMA || > type == MTK_DPI || > type == MTK_DSI || > type == MTK_DISP_OVL || > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 5d39dd54255d1..279d3e6f11563 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -486,11 +486,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the COLOR, OVL, RDMA, DSI, and DPI blocks have > + * Currently only the COLOR, GAMMA, OVL, RDMA, DSI, and DPI blocks have > * separate component platform drivers and initialize their own > * DDP component structure. The others are initialized here. > */ > if (comp_type == MTK_DISP_COLOR || > + comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > comp_type == MTK_DISP_OVL_2L || > comp_type == MTK_DISP_RDMA || > @@ -589,6 +590,7 @@ static struct platform_driver mtk_drm_platform_driver = { > > static struct platform_driver * const mtk_drm_drivers[] = { > &mtk_disp_color_driver, > + &mtk_disp_gamma_driver, > &mtk_disp_ovl_driver, > &mtk_disp_rdma_driver, > &mtk_dpi_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index e8238fa4aa2ac..0e54e3d51014a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -47,6 +47,7 @@ struct mtk_drm_private { > }; > > extern struct platform_driver mtk_disp_color_driver; > +extern struct platform_driver mtk_disp_gamma_driver; > extern struct platform_driver mtk_disp_ovl_driver; > extern struct platform_driver mtk_disp_rdma_driver; > extern struct platform_driver mtk_dpi_driver; _______________________________________________ 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 X-Spam-Level: X-Spam-Status: No, score=-12.7 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, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 95D8CC433DB for ; Thu, 28 Jan 2021 05:35:43 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 37DA660C40 for ; Thu, 28 Jan 2021 05:35:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37DA660C40 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date: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=XT5/SjP78bsaxSTd6BJmZSHq/4vZCgtiUFFASv8ra+c=; b=r4lRwE0qQEXJmD0DR1qf87/kg JL0BN5Gbu1LH5SvU2lF9o8LpUvVSJlK1vDH3R45kQw1OveWhRZbTaE0Ap02PQ7hf0tHNh0NlRo8I4 WFaAoIFCPySt+ws336X8sEicv+dKqxqAdVPLwX6vdKJDe4fFNtZStrMxEsi42scRnae0LaMWjWJIT Up1UtG4yK/1GD9bKCroVyWiQkXnubUYJ+IA4Tl+xnX7oQXOVSDJvrZNwiaRwdDpDHKWduDqtemNg3 8zBxpeLgd2AWh6gAv9uIbab3XHRrDHpRUvp9eDHK/XeMgEY20KTn1mTuRgk1xiiJd2EUk3Kyl6mbm KgLbTTp7g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4zwX-00071B-6t; Thu, 28 Jan 2021 05:34:09 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4zwT-00070Y-M2; Thu, 28 Jan 2021 05:34:07 +0000 X-UUID: f4036ff12ac14332b3b14b2a52faed1e-20210127 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=YE9IqQ50ZpT8YURQ2js2UPrxNnQWoNPjEPrZqWAPV1w=; b=mUMqjWvFBSO4OiRXQg/8ErdgRbbM0nLF0lZ0unpT845VliYTK1QVt9uyUvGH6sJ07xuY7HXpWRwvLkaStKd+Nr7hSqtGL7Kuw2aan6cMdF3Th6tRfrOSznCNoeCtYbP79bTnmKjKPcRgnkAVJflf9MXSzAHxX95PWgsa8E7C0gg=; X-UUID: f4036ff12ac14332b3b14b2a52faed1e-20210127 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 680878475; Wed, 27 Jan 2021 21:34:01 -0800 Received: from MTKMBS31N1.mediatek.inc (172.27.4.69) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 27 Jan 2021 21:33:59 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 28 Jan 2021 13:33:52 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 28 Jan 2021 13:33:52 +0800 Message-ID: <1611812032.28312.0.camel@mtksdaap41> Subject: Re: [PATCH v10 5/9] drm/mediatek: separate gamma module From: CK Hu To: Hsin-Yi Wang Date: Thu, 28 Jan 2021 13:33:52 +0800 In-Reply-To: <20210127045422.2418917-6-hsinyi@chromium.org> References: <20210127045422.2418917-1-hsinyi@chromium.org> <20210127045422.2418917-6-hsinyi@chromium.org> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: F7372C9677493752AB582EA8CAA11D72DB6212585926DC666EBD13B8797F14AD2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210128_003405_997727_8208F1A0 X-CRM114-Status: GOOD ( 29.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Philipp Zabel , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Yongqiang Niu , Project_Global_Chrome_Upstream_Group@mediatek.com, linux-mediatek@lists.infradead.org, Daniel Vetter , Matthias Brugger , linux-arm-kernel@lists.infradead.org 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, Hsin-Yi: On Wed, 2021-01-27 at 12:54 +0800, Hsin-Yi Wang wrote: > From: Yongqiang Niu > > mt8183 gamma module will different with mt8173 > separate gamma for add private data Reviewed-by: CK Hu > > Signed-off-by: Yongqiang Niu > Signed-off-by: Hsin-Yi Wang > --- > drivers/gpu/drm/mediatek/Makefile | 1 + > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 10 ++ > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 188 ++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 71 ++------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 214 insertions(+), 61 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index 01d06332f7679..b64674b944860 100644 > --- a/drivers/gpu/drm/mediatek/Makefile > +++ b/drivers/gpu/drm/mediatek/Makefile > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > > mediatek-drm-y := mtk_disp_color.o \ > + mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > mtk_disp_rdma.o \ > mtk_drm_crtc.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index c50d5fc9fd349..c1e658b490b6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -27,6 +27,16 @@ void mtk_dpi_stop(struct device *dev); > void mtk_dsi_ddp_start(struct device *dev); > void mtk_dsi_ddp_stop(struct device *dev); > > +int mtk_gamma_clk_enable(struct device *dev); > +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); > +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_start(struct device *dev); > +void mtk_gamma_stop(struct device *dev); > + > void mtk_ovl_bgclr_in_on(struct device *dev); > void mtk_ovl_bgclr_in_off(struct device *dev); > void mtk_ovl_bypass_shadow(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > new file mode 100644 > index 0000000000000..b5a499d7e472c > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -0,0 +1,188 @@ > +/* > + * SPDX-License-Identifier: > + * > + * Copyright (c) 2020 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_GAMMA_EN 0x0000 > +#define GAMMA_EN BIT(0) > +#define DISP_GAMMA_CFG 0x0020 > +#define GAMMA_LUT_EN BIT(1) > +#define DISP_GAMMA_SIZE 0x0030 > +#define DISP_GAMMA_LUT 0x0700 > + > +#define LUT_10BIT_MASK 0x03ff > + > +struct mtk_disp_gamma_data { > + u32 reserved; > +}; > + > +/** > + * struct mtk_disp_gamma - DISP_GAMMA driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_gamma { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_gamma_data *data; > +}; > + > +int mtk_gamma_clk_enable(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + return clk_prepare_enable(gamma->clk); > +} > + > +void mtk_gamma_clk_disable(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + clk_disable_unprepare(gamma->clk); > +} > + > +void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state) > +{ > + unsigned int i, reg; > + struct drm_color_lut *lut; > + void __iomem *lut_base; > + u32 word; > + > + if (state->gamma_lut) { > + reg = readl(regs + DISP_GAMMA_CFG); > + reg = reg | GAMMA_LUT_EN; > + writel(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)); > + } > + } > +} > + > +void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + mtk_gamma_set_common(gamma->regs, state); > +} > + > +void mtk_gamma_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, h << 16 | w, &gamma->cmdq_reg, gamma->regs, > + DISP_GAMMA_SIZE); > + mtk_dither_set_common(gamma->regs, &gamma->cmdq_reg, bpc, DISP_GAMMA_CFG, cmdq_pkt); > +} > + > +void mtk_gamma_start(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + writel(GAMMA_EN, gamma->regs + DISP_GAMMA_EN); > +} > + > +void mtk_gamma_stop(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, gamma->regs + DISP_GAMMA_EN); > +} > + > +static int mtk_disp_gamma_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_gamma_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_gamma_component_ops = { > + .bind = mtk_disp_gamma_bind, > + .unbind = mtk_disp_gamma_unbind, > +}; > + > +static int mtk_disp_gamma_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_gamma *priv; > + struct resource *res; > + int ret; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->clk = devm_clk_get(dev, NULL); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "failed to get gamma clk\n"); > + return PTR_ERR(priv->clk); > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + priv->regs = devm_ioremap_resource(dev, res); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "failed to ioremap gamma\n"); > + return PTR_ERR(priv->regs); > + } > + > +#if IS_REACHABLE(CONFIG_MTK_CMDQ) > + ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > + if (ret) > + dev_dbg(dev, "get mediatek,gce-client-reg fail!\n"); > +#endif > + > + priv->data = of_device_get_match_data(dev); > + platform_set_drvdata(pdev, priv); > + > + ret = component_add(dev, &mtk_disp_gamma_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_gamma_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_gamma_component_ops); > + > + return 0; > +} > + > +static const struct of_device_id mtk_disp_gamma_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-gamma"}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match); > + > +struct platform_driver mtk_disp_gamma_driver = { > + .probe = mtk_disp_gamma_probe, > + .remove = mtk_disp_gamma_remove, > + .driver = { > + .name = "mediatek-disp-gamma", > + .owner = THIS_MODULE, > + .of_match_table = mtk_disp_gamma_driver_dt_match, > + }, > +}; > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 53d25823a37cc..8173f709272be 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -55,11 +55,6 @@ > #define DITHER_RELAY_MODE BIT(0) > #define DISP_DITHER_SIZE 0x0030 > > -#define DISP_GAMMA_EN 0x0000 > -#define DISP_GAMMA_CFG 0x0020 > -#define DISP_GAMMA_SIZE 0x0030 > -#define DISP_GAMMA_LUT 0x0700 > - > #define LUT_10BIT_MASK 0x03ff > > #define OD_RELAYMODE BIT(0) > @@ -68,9 +63,6 @@ > > #define AAL_EN BIT(0) > > -#define GAMMA_EN BIT(0) > -#define GAMMA_LUT_EN BIT(1) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -151,7 +143,6 @@ static void mtk_ddp_clk_disable(struct device *dev) > clk_disable_unprepare(priv->clk); > } > > - > void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg, > unsigned int bpc, unsigned int CFG, struct cmdq_pkt *cmdq_pkt) > { > @@ -219,6 +210,13 @@ static void mtk_aal_config(struct device *dev, unsigned int w, > mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE); > } > > +static void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > + > + mtk_gamma_set_common(priv->regs, state); > +} > + > static void mtk_aal_start(struct device *dev) > { > struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > @@ -333,58 +331,10 @@ static void mtk_dither_stop(struct device *dev) > writel_relaxed(0x0, priv->regs + DISP_DITHER_EN); > } > > -static void mtk_gamma_config(struct device *dev, unsigned int w, > - unsigned int h, unsigned int vrefresh, > - unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - mtk_ddp_write(cmdq_pkt, h << 16 | w, &priv->cmdq_reg, priv->regs, DISP_GAMMA_SIZE); > - mtk_dither_set(dev, bpc, DISP_GAMMA_CFG, cmdq_pkt); > -} > - > -static void mtk_gamma_start(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel(GAMMA_EN, priv->regs + DISP_GAMMA_EN); > -} > - > -static void mtk_gamma_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_GAMMA_EN); > -} > - > -static void mtk_gamma_set(struct device *dev, > - struct drm_crtc_state *state) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - unsigned int i, reg; > - struct drm_color_lut *lut; > - void __iomem *lut_base; > - u32 word; > - > - if (state->gamma_lut) { > - reg = readl(priv->regs + DISP_GAMMA_CFG); > - reg = reg | GAMMA_LUT_EN; > - writel(reg, priv->regs + DISP_GAMMA_CFG); > - lut_base = priv->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)); > - } > - } > -} > - > static const struct mtk_ddp_comp_funcs ddp_aal = { > .clk_enable = mtk_ddp_clk_enable, > .clk_disable = mtk_ddp_clk_disable, > - .gamma_set = mtk_gamma_set, > + .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > .stop = mtk_aal_stop, > @@ -425,8 +375,8 @@ static const struct mtk_ddp_comp_funcs ddp_dsi = { > }; > > static const struct mtk_ddp_comp_funcs ddp_gamma = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_gamma_clk_enable, > + .clk_disable = mtk_gamma_clk_disable, > .gamma_set = mtk_gamma_set, > .config = mtk_gamma_config, > .start = mtk_gamma_start, > @@ -642,6 +592,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, > > if (type == MTK_DISP_BLS || > type == MTK_DISP_COLOR || > + type == MTK_DISP_GAMMA || > type == MTK_DPI || > type == MTK_DSI || > type == MTK_DISP_OVL || > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 5d39dd54255d1..279d3e6f11563 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -486,11 +486,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the COLOR, OVL, RDMA, DSI, and DPI blocks have > + * Currently only the COLOR, GAMMA, OVL, RDMA, DSI, and DPI blocks have > * separate component platform drivers and initialize their own > * DDP component structure. The others are initialized here. > */ > if (comp_type == MTK_DISP_COLOR || > + comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > comp_type == MTK_DISP_OVL_2L || > comp_type == MTK_DISP_RDMA || > @@ -589,6 +590,7 @@ static struct platform_driver mtk_drm_platform_driver = { > > static struct platform_driver * const mtk_drm_drivers[] = { > &mtk_disp_color_driver, > + &mtk_disp_gamma_driver, > &mtk_disp_ovl_driver, > &mtk_disp_rdma_driver, > &mtk_dpi_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index e8238fa4aa2ac..0e54e3d51014a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -47,6 +47,7 @@ struct mtk_drm_private { > }; > > extern struct platform_driver mtk_disp_color_driver; > +extern struct platform_driver mtk_disp_gamma_driver; > extern struct platform_driver mtk_disp_ovl_driver; > extern struct platform_driver mtk_disp_rdma_driver; > extern struct platform_driver mtk_dpi_driver; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-14.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 E221CC433E0 for ; Thu, 28 Jan 2021 05:35:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8CDD564DDA for ; Thu, 28 Jan 2021 05:35:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229462AbhA1FfD (ORCPT ); Thu, 28 Jan 2021 00:35:03 -0500 Received: from mailgw02.mediatek.com ([1.203.163.81]:27731 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229446AbhA1FfC (ORCPT ); Thu, 28 Jan 2021 00:35:02 -0500 X-UUID: e421a2ab60a24209bad38817ef9a8a9c-20210128 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=YE9IqQ50ZpT8YURQ2js2UPrxNnQWoNPjEPrZqWAPV1w=; b=mUMqjWvFBSO4OiRXQg/8ErdgRbbM0nLF0lZ0unpT845VliYTK1QVt9uyUvGH6sJ07xuY7HXpWRwvLkaStKd+Nr7hSqtGL7Kuw2aan6cMdF3Th6tRfrOSznCNoeCtYbP79bTnmKjKPcRgnkAVJflf9MXSzAHxX95PWgsa8E7C0gg=; X-UUID: e421a2ab60a24209bad38817ef9a8a9c-20210128 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1597554940; Thu, 28 Jan 2021 13:33:58 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 28 Jan 2021 13:33:52 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 28 Jan 2021 13:33:52 +0800 Message-ID: <1611812032.28312.0.camel@mtksdaap41> Subject: Re: [PATCH v10 5/9] drm/mediatek: separate gamma module From: CK Hu To: Hsin-Yi Wang CC: Philipp Zabel , Matthias Brugger , David Airlie , Daniel Vetter , Mark Rutland , , , , , , , Yongqiang Niu Date: Thu, 28 Jan 2021 13:33:52 +0800 In-Reply-To: <20210127045422.2418917-6-hsinyi@chromium.org> References: <20210127045422.2418917-1-hsinyi@chromium.org> <20210127045422.2418917-6-hsinyi@chromium.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: F7372C9677493752AB582EA8CAA11D72DB6212585926DC666EBD13B8797F14AD2000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org SGksIEhzaW4tWWk6DQoNCk9uIFdlZCwgMjAyMS0wMS0yNyBhdCAxMjo1NCArMDgwMCwgSHNpbi1Z aSBXYW5nIHdyb3RlOg0KPiBGcm9tOiBZb25ncWlhbmcgTml1IDx5b25ncWlhbmcubml1QG1lZGlh dGVrLmNvbT4NCj4gDQo+IG10ODE4MyBnYW1tYSBtb2R1bGUgd2lsbCBkaWZmZXJlbnQgd2l0aCBt dDgxNzMNCj4gc2VwYXJhdGUgZ2FtbWEgZm9yIGFkZCBwcml2YXRlIGRhdGENCg0KUmV2aWV3ZWQt Ynk6IENLIEh1IDxjay5odUBtZWRpYXRlay5jb20+DQoNCj4gDQo+IFNpZ25lZC1vZmYtYnk6IFlv bmdxaWFuZyBOaXUgPHlvbmdxaWFuZy5uaXVAbWVkaWF0ZWsuY29tPg0KPiBTaWduZWQtb2ZmLWJ5 OiBIc2luLVlpIFdhbmcgPGhzaW55aUBjaHJvbWl1bS5vcmc+DQo+IC0tLQ0KPiAgZHJpdmVycy9n cHUvZHJtL21lZGlhdGVrL01ha2VmaWxlICAgICAgICAgICB8ICAgMSArDQo+ICBkcml2ZXJzL2dw dS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3BfZHJ2LmggICAgIHwgIDEwICsrDQo+ICBkcml2ZXJzL2dw dS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3BfZ2FtbWEuYyAgIHwgMTg4ICsrKysrKysrKysrKysrKysr KysrDQo+ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kZHBfY29tcC5jIHwgIDcx ICsrLS0tLS0tDQo+ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuYyAgICAg IHwgICA0ICstDQo+ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuaCAgICAg IHwgICAxICsNCj4gIDYgZmlsZXMgY2hhbmdlZCwgMjE0IGluc2VydGlvbnMoKyksIDYxIGRlbGV0 aW9ucygtKQ0KPiAgY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9t dGtfZGlzcF9nYW1tYS5jDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlh dGVrL01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL01ha2VmaWxlDQo+IGluZGV4 IDAxZDA2MzMyZjc2NzkuLmI2NDY3NGI5NDQ4NjAgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9tZWRpYXRlay9NYWtlZmlsZQ0KPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsv TWFrZWZpbGUNCj4gQEAgLTEsNiArMSw3IEBADQo+ICAjIFNQRFgtTGljZW5zZS1JZGVudGlmaWVy OiBHUEwtMi4wDQo+ICANCj4gIG1lZGlhdGVrLWRybS15IDo9IG10a19kaXNwX2NvbG9yLm8gXA0K PiArCQkgIG10a19kaXNwX2dhbW1hLm8gXA0KPiAgCQkgIG10a19kaXNwX292bC5vIFwNCj4gIAkJ ICBtdGtfZGlzcF9yZG1hLm8gXA0KPiAgCQkgIG10a19kcm1fY3J0Yy5vIFwNCj4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZGlzcF9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9tZWRpYXRlay9tdGtfZGlzcF9kcnYuaA0KPiBpbmRleCBjNTBkNWZjOWZkMzQ5Li5jMWU2 NThiNDkwYjZjIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Rp c3BfZHJ2LmgNCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX2Rydi5o DQo+IEBAIC0yNyw2ICsyNywxNiBAQCB2b2lkIG10a19kcGlfc3RvcChzdHJ1Y3QgZGV2aWNlICpk ZXYpOw0KPiAgdm9pZCBtdGtfZHNpX2RkcF9zdGFydChzdHJ1Y3QgZGV2aWNlICpkZXYpOw0KPiAg dm9pZCBtdGtfZHNpX2RkcF9zdG9wKHN0cnVjdCBkZXZpY2UgKmRldik7DQo+ICANCj4gK2ludCBt dGtfZ2FtbWFfY2xrX2VuYWJsZShzdHJ1Y3QgZGV2aWNlICpkZXYpOw0KPiArdm9pZCBtdGtfZ2Ft bWFfY2xrX2Rpc2FibGUoc3RydWN0IGRldmljZSAqZGV2KTsNCj4gK3ZvaWQgbXRrX2dhbW1hX2Nv bmZpZyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCB3LA0KPiArICAgICAgICAgICAg ICAgICAgICAgIHVuc2lnbmVkIGludCBoLCB1bnNpZ25lZCBpbnQgdnJlZnJlc2gsDQo+ICsgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGJwYywgc3RydWN0IGNtZHFfcGt0ICpjbWRx X3BrdCk7DQo+ICt2b2lkIG10a19nYW1tYV9zZXQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKnN0YXRlKTsNCj4gK3ZvaWQgbXRrX2dhbW1hX3NldF9jb21tb24odm9p ZCBfX2lvbWVtICpyZWdzLCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKTsNCj4gK3ZvaWQg bXRrX2dhbW1hX3N0YXJ0KHN0cnVjdCBkZXZpY2UgKmRldik7DQo+ICt2b2lkIG10a19nYW1tYV9z dG9wKHN0cnVjdCBkZXZpY2UgKmRldik7DQo+ICsNCj4gIHZvaWQgbXRrX292bF9iZ2Nscl9pbl9v bihzdHJ1Y3QgZGV2aWNlICpkZXYpOw0KPiAgdm9pZCBtdGtfb3ZsX2JnY2xyX2luX29mZihzdHJ1 Y3QgZGV2aWNlICpkZXYpOw0KPiAgdm9pZCBtdGtfb3ZsX2J5cGFzc19zaGFkb3coc3RydWN0IGRl dmljZSAqZGV2KTsNCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtf ZGlzcF9nYW1tYS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX2dhbW1hLmMN Cj4gbmV3IGZpbGUgbW9kZSAxMDA2NDQNCj4gaW5kZXggMDAwMDAwMDAwMDAwMC4uYjVhNDk5ZDdl NDcyYw0KPiAtLS0gL2Rldi9udWxsDQo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9t dGtfZGlzcF9nYW1tYS5jDQo+IEBAIC0wLDAgKzEsMTg4IEBADQo+ICsvKg0KPiArICogU1BEWC1M aWNlbnNlLUlkZW50aWZpZXI6DQo+ICsgKg0KPiArICogQ29weXJpZ2h0IChjKSAyMDIwIE1lZGlh VGVrIEluYy4NCj4gKyAqLw0KPiArDQo+ICsjaW5jbHVkZSA8bGludXgvY2xrLmg+DQo+ICsjaW5j bHVkZSA8bGludXgvY29tcG9uZW50Lmg+DQo+ICsjaW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+ DQo+ICsjaW5jbHVkZSA8bGludXgvb2ZfaXJxLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvcGxhdGZv cm1fZGV2aWNlLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvc29jL21lZGlhdGVrL210ay1jbWRxLmg+ DQo+ICsNCj4gKyNpbmNsdWRlICJtdGtfZGlzcF9kcnYuaCINCj4gKyNpbmNsdWRlICJtdGtfZHJt X2NydGMuaCINCj4gKyNpbmNsdWRlICJtdGtfZHJtX2RkcF9jb21wLmgiDQo+ICsNCj4gKyNkZWZp bmUgRElTUF9HQU1NQV9FTgkJCQkweDAwMDANCj4gKyNkZWZpbmUgR0FNTUFfRU4JCQkJCUJJVCgw KQ0KPiArI2RlZmluZSBESVNQX0dBTU1BX0NGRwkJCQkweDAwMjANCj4gKyNkZWZpbmUgR0FNTUFf TFVUX0VOCQkJCQlCSVQoMSkNCj4gKyNkZWZpbmUgRElTUF9HQU1NQV9TSVpFCQkJCTB4MDAzMA0K PiArI2RlZmluZSBESVNQX0dBTU1BX0xVVAkJCQkweDA3MDANCj4gKw0KPiArI2RlZmluZSBMVVRf MTBCSVRfTUFTSwkJCQkweDAzZmYNCj4gKw0KPiArc3RydWN0IG10a19kaXNwX2dhbW1hX2RhdGEg ew0KPiArCXUzMiByZXNlcnZlZDsNCj4gK307DQo+ICsNCj4gKy8qKg0KPiArICogc3RydWN0IG10 a19kaXNwX2dhbW1hIC0gRElTUF9HQU1NQSBkcml2ZXIgc3RydWN0dXJlDQo+ICsgKiBAZGRwX2Nv bXAgLSBzdHJ1Y3R1cmUgY29udGFpbmluZyB0eXBlIGVudW0gYW5kIGhhcmR3YXJlIHJlc291cmNl cw0KPiArICogQGNydGMgLSBhc3NvY2lhdGVkIGNydGMgdG8gcmVwb3J0IGlycSBldmVudHMgdG8N Cj4gKyAqLw0KPiArc3RydWN0IG10a19kaXNwX2dhbW1hIHsNCj4gKwlzdHJ1Y3QgY2xrICpjbGs7 DQo+ICsJdm9pZCBfX2lvbWVtICpyZWdzOw0KPiArCXN0cnVjdCBjbWRxX2NsaWVudF9yZWcgY21k cV9yZWc7DQo+ICsJY29uc3Qgc3RydWN0IG10a19kaXNwX2dhbW1hX2RhdGEgKmRhdGE7DQo+ICt9 Ow0KPiArDQo+ICtpbnQgbXRrX2dhbW1hX2Nsa19lbmFibGUoc3RydWN0IGRldmljZSAqZGV2KQ0K PiArew0KPiArCXN0cnVjdCBtdGtfZGlzcF9nYW1tYSAqZ2FtbWEgPSBkZXZfZ2V0X2RydmRhdGEo ZGV2KTsNCj4gKw0KPiArCXJldHVybiBjbGtfcHJlcGFyZV9lbmFibGUoZ2FtbWEtPmNsayk7DQo+ ICt9DQo+ICsNCj4gK3ZvaWQgbXRrX2dhbW1hX2Nsa19kaXNhYmxlKHN0cnVjdCBkZXZpY2UgKmRl dikNCj4gK3sNCj4gKwlzdHJ1Y3QgbXRrX2Rpc3BfZ2FtbWEgKmdhbW1hID0gZGV2X2dldF9kcnZk YXRhKGRldik7DQo+ICsNCj4gKwljbGtfZGlzYWJsZV91bnByZXBhcmUoZ2FtbWEtPmNsayk7DQo+ ICt9DQo+ICsNCj4gK3ZvaWQgbXRrX2dhbW1hX3NldF9jb21tb24odm9pZCBfX2lvbWVtICpyZWdz LCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKQ0KPiArew0KPiArCXVuc2lnbmVkIGludCBp LCByZWc7DQo+ICsJc3RydWN0IGRybV9jb2xvcl9sdXQgKmx1dDsNCj4gKwl2b2lkIF9faW9tZW0g Kmx1dF9iYXNlOw0KPiArCXUzMiB3b3JkOw0KPiArDQo+ICsJaWYgKHN0YXRlLT5nYW1tYV9sdXQp IHsNCj4gKwkJcmVnID0gcmVhZGwocmVncyArIERJU1BfR0FNTUFfQ0ZHKTsNCj4gKwkJcmVnID0g cmVnIHwgR0FNTUFfTFVUX0VOOw0KPiArCQl3cml0ZWwocmVnLCByZWdzICsgRElTUF9HQU1NQV9D RkcpOw0KPiArCQlsdXRfYmFzZSA9IHJlZ3MgKyBESVNQX0dBTU1BX0xVVDsNCj4gKwkJbHV0ID0g KHN0cnVjdCBkcm1fY29sb3JfbHV0ICopc3RhdGUtPmdhbW1hX2x1dC0+ZGF0YTsNCj4gKwkJZm9y IChpID0gMDsgaSA8IE1US19MVVRfU0laRTsgaSsrKSB7DQo+ICsJCQl3b3JkID0gKCgobHV0W2ld LnJlZCA+PiA2KSAmIExVVF8xMEJJVF9NQVNLKSA8PCAyMCkgKw0KPiArCQkJCSgoKGx1dFtpXS5n cmVlbiA+PiA2KSAmIExVVF8xMEJJVF9NQVNLKSA8PCAxMCkgKw0KPiArCQkJCSgobHV0W2ldLmJs dWUgPj4gNikgJiBMVVRfMTBCSVRfTUFTSyk7DQo+ICsJCQl3cml0ZWwod29yZCwgKGx1dF9iYXNl ICsgaSAqIDQpKTsNCj4gKwkJfQ0KPiArCX0NCj4gK30NCj4gKw0KPiArdm9pZCBtdGtfZ2FtbWFf c2V0KHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkNCj4g K3sNCj4gKwlzdHJ1Y3QgbXRrX2Rpc3BfZ2FtbWEgKmdhbW1hID0gZGV2X2dldF9kcnZkYXRhKGRl dik7DQo+ICsNCj4gKwltdGtfZ2FtbWFfc2V0X2NvbW1vbihnYW1tYS0+cmVncywgc3RhdGUpOw0K PiArfQ0KPiArDQo+ICt2b2lkIG10a19nYW1tYV9jb25maWcoc3RydWN0IGRldmljZSAqZGV2LCB1 bnNpZ25lZCBpbnQgdywNCj4gKwkJICAgICAgdW5zaWduZWQgaW50IGgsIHVuc2lnbmVkIGludCB2 cmVmcmVzaCwNCj4gKwkJICAgICAgdW5zaWduZWQgaW50IGJwYywgc3RydWN0IGNtZHFfcGt0ICpj bWRxX3BrdCkNCj4gK3sNCj4gKwlzdHJ1Y3QgbXRrX2Rpc3BfZ2FtbWEgKmdhbW1hID0gZGV2X2dl dF9kcnZkYXRhKGRldik7DQo+ICsNCj4gKwltdGtfZGRwX3dyaXRlKGNtZHFfcGt0LCBoIDw8IDE2 IHwgdywgJmdhbW1hLT5jbWRxX3JlZywgZ2FtbWEtPnJlZ3MsDQo+ICsJCSAgICAgIERJU1BfR0FN TUFfU0laRSk7DQo+ICsJbXRrX2RpdGhlcl9zZXRfY29tbW9uKGdhbW1hLT5yZWdzLCAmZ2FtbWEt PmNtZHFfcmVnLCBicGMsIERJU1BfR0FNTUFfQ0ZHLCBjbWRxX3BrdCk7DQo+ICt9DQo+ICsNCj4g K3ZvaWQgbXRrX2dhbW1hX3N0YXJ0KHN0cnVjdCBkZXZpY2UgKmRldikNCj4gK3sNCj4gKwlzdHJ1 Y3QgbXRrX2Rpc3BfZ2FtbWEgKmdhbW1hID0gZGV2X2dldF9kcnZkYXRhKGRldik7DQo+ICsNCj4g Kwl3cml0ZWwoR0FNTUFfRU4sIGdhbW1hLT5yZWdzICsgRElTUF9HQU1NQV9FTik7DQo+ICt9DQo+ ICsNCj4gK3ZvaWQgbXRrX2dhbW1hX3N0b3Aoc3RydWN0IGRldmljZSAqZGV2KQ0KPiArew0KPiAr CXN0cnVjdCBtdGtfZGlzcF9nYW1tYSAqZ2FtbWEgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsNCj4g Kw0KPiArCXdyaXRlbF9yZWxheGVkKDB4MCwgZ2FtbWEtPnJlZ3MgKyBESVNQX0dBTU1BX0VOKTsN Cj4gK30NCj4gKw0KPiArc3RhdGljIGludCBtdGtfZGlzcF9nYW1tYV9iaW5kKHN0cnVjdCBkZXZp Y2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLA0KPiArCQkJICAgICAgIHZvaWQgKmRhdGEp DQo+ICt7DQo+ICsJcmV0dXJuIDA7DQo+ICt9DQo+ICsNCj4gK3N0YXRpYyB2b2lkIG10a19kaXNw X2dhbW1hX3VuYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwN Cj4gKwkJCQkgIHZvaWQgKmRhdGEpDQo+ICt7DQo+ICt9DQo+ICsNCj4gK3N0YXRpYyBjb25zdCBz dHJ1Y3QgY29tcG9uZW50X29wcyBtdGtfZGlzcF9nYW1tYV9jb21wb25lbnRfb3BzID0gew0KPiAr CS5iaW5kCT0gbXRrX2Rpc3BfZ2FtbWFfYmluZCwNCj4gKwkudW5iaW5kID0gbXRrX2Rpc3BfZ2Ft bWFfdW5iaW5kLA0KPiArfTsNCj4gKw0KPiArc3RhdGljIGludCBtdGtfZGlzcF9nYW1tYV9wcm9i ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiArew0KPiArCXN0cnVjdCBkZXZpY2Ug KmRldiA9ICZwZGV2LT5kZXY7DQo+ICsJc3RydWN0IG10a19kaXNwX2dhbW1hICpwcml2Ow0KPiAr CXN0cnVjdCByZXNvdXJjZSAqcmVzOw0KPiArCWludCByZXQ7DQo+ICsNCj4gKwlwcml2ID0gZGV2 bV9remFsbG9jKGRldiwgc2l6ZW9mKCpwcml2KSwgR0ZQX0tFUk5FTCk7DQo+ICsJaWYgKCFwcml2 KQ0KPiArCQlyZXR1cm4gLUVOT01FTTsNCj4gKw0KPiArCXByaXYtPmNsayA9IGRldm1fY2xrX2dl dChkZXYsIE5VTEwpOw0KPiArCWlmIChJU19FUlIocHJpdi0+Y2xrKSkgew0KPiArCQlkZXZfZXJy KGRldiwgImZhaWxlZCB0byBnZXQgZ2FtbWEgY2xrXG4iKTsNCj4gKwkJcmV0dXJuIFBUUl9FUlIo cHJpdi0+Y2xrKTsNCj4gKwl9DQo+ICsNCj4gKwlyZXMgPSBwbGF0Zm9ybV9nZXRfcmVzb3VyY2Uo cGRldiwgSU9SRVNPVVJDRV9NRU0sIDApOw0KPiArCXByaXYtPnJlZ3MgPSBkZXZtX2lvcmVtYXBf cmVzb3VyY2UoZGV2LCByZXMpOw0KPiArCWlmIChJU19FUlIocHJpdi0+cmVncykpIHsNCj4gKwkJ ZGV2X2VycihkZXYsICJmYWlsZWQgdG8gaW9yZW1hcCBnYW1tYVxuIik7DQo+ICsJCXJldHVybiBQ VFJfRVJSKHByaXYtPnJlZ3MpOw0KPiArCX0NCj4gKw0KPiArI2lmIElTX1JFQUNIQUJMRShDT05G SUdfTVRLX0NNRFEpDQo+ICsJcmV0ID0gY21kcV9kZXZfZ2V0X2NsaWVudF9yZWcoZGV2LCAmcHJp di0+Y21kcV9yZWcsIDApOw0KPiArCWlmIChyZXQpDQo+ICsJCWRldl9kYmcoZGV2LCAiZ2V0IG1l ZGlhdGVrLGdjZS1jbGllbnQtcmVnIGZhaWwhXG4iKTsNCj4gKyNlbmRpZg0KPiArDQo+ICsJcHJp di0+ZGF0YSA9IG9mX2RldmljZV9nZXRfbWF0Y2hfZGF0YShkZXYpOw0KPiArCXBsYXRmb3JtX3Nl dF9kcnZkYXRhKHBkZXYsIHByaXYpOw0KPiArDQo+ICsJcmV0ID0gY29tcG9uZW50X2FkZChkZXYs ICZtdGtfZGlzcF9nYW1tYV9jb21wb25lbnRfb3BzKTsNCj4gKwlpZiAocmV0KQ0KPiArCQlkZXZf ZXJyKGRldiwgIkZhaWxlZCB0byBhZGQgY29tcG9uZW50OiAlZFxuIiwgcmV0KTsNCj4gKw0KPiAr CXJldHVybiByZXQ7DQo+ICt9DQo+ICsNCj4gK3N0YXRpYyBpbnQgbXRrX2Rpc3BfZ2FtbWFfcmVt b3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ICt7DQo+ICsJY29tcG9uZW50X2Rl bCgmcGRldi0+ZGV2LCAmbXRrX2Rpc3BfZ2FtbWFfY29tcG9uZW50X29wcyk7DQo+ICsNCj4gKwly ZXR1cm4gMDsNCj4gK30NCj4gKw0KPiArc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQg bXRrX2Rpc3BfZ2FtbWFfZHJpdmVyX2R0X21hdGNoW10gPSB7DQo+ICsJeyAuY29tcGF0aWJsZSA9 ICJtZWRpYXRlayxtdDgxNzMtZGlzcC1nYW1tYSJ9LA0KPiArCXt9LA0KPiArfTsNCj4gK01PRFVM RV9ERVZJQ0VfVEFCTEUob2YsIG10a19kaXNwX2dhbW1hX2RyaXZlcl9kdF9tYXRjaCk7DQo+ICsN Cj4gK3N0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2Rpc3BfZ2FtbWFfZHJpdmVyID0gew0KPiAr CS5wcm9iZQkJPSBtdGtfZGlzcF9nYW1tYV9wcm9iZSwNCj4gKwkucmVtb3ZlCQk9IG10a19kaXNw X2dhbW1hX3JlbW92ZSwNCj4gKwkuZHJpdmVyCQk9IHsNCj4gKwkJLm5hbWUJPSAibWVkaWF0ZWst ZGlzcC1nYW1tYSIsDQo+ICsJCS5vd25lcgk9IFRISVNfTU9EVUxFLA0KPiArCQkub2ZfbWF0Y2hf dGFibGUgPSBtdGtfZGlzcF9nYW1tYV9kcml2ZXJfZHRfbWF0Y2gsDQo+ICsJfSwNCj4gK307DQo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kZHBfY29tcC5j IGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZGRwX2NvbXAuYw0KPiBpbmRleCA1 M2QyNTgyM2EzN2NjLi44MTczZjcwOTI3MmJlIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vbWVkaWF0ZWsvbXRrX2RybV9kZHBfY29tcC5jDQo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9t ZWRpYXRlay9tdGtfZHJtX2RkcF9jb21wLmMNCj4gQEAgLTU1LDExICs1NSw2IEBADQo+ICAjZGVm aW5lIERJVEhFUl9SRUxBWV9NT0RFCQkJQklUKDApDQo+ICAjZGVmaW5lIERJU1BfRElUSEVSX1NJ WkUJCQkweDAwMzANCj4gIA0KPiAtI2RlZmluZSBESVNQX0dBTU1BX0VOCQkJCTB4MDAwMA0KPiAt I2RlZmluZSBESVNQX0dBTU1BX0NGRwkJCQkweDAwMjANCj4gLSNkZWZpbmUgRElTUF9HQU1NQV9T SVpFCQkJCTB4MDAzMA0KPiAtI2RlZmluZSBESVNQX0dBTU1BX0xVVAkJCQkweDA3MDANCj4gLQ0K PiAgI2RlZmluZSBMVVRfMTBCSVRfTUFTSwkJCQkweDAzZmYNCj4gIA0KPiAgI2RlZmluZSBPRF9S RUxBWU1PREUJCQkJQklUKDApDQo+IEBAIC02OCw5ICs2Myw2IEBADQo+ICANCj4gICNkZWZpbmUg QUFMX0VOCQkJCQlCSVQoMCkNCj4gIA0KPiAtI2RlZmluZSBHQU1NQV9FTgkJCQlCSVQoMCkNCj4g LSNkZWZpbmUgR0FNTUFfTFVUX0VOCQkJCUJJVCgxKQ0KPiAtDQo+ICAjZGVmaW5lIERJU1BfRElU SEVSSU5HCQkJCUJJVCgyKQ0KPiAgI2RlZmluZSBESVRIRVJfTFNCX0VSUl9TSElGVF9SKHgpCQko KCh4KSAmIDB4NykgPDwgMjgpDQo+ICAjZGVmaW5lIERJVEhFUl9PVkZMV19CSVRfUih4KQkJCSgo KHgpICYgMHg3KSA8PCAyNCkNCj4gQEAgLTE1MSw3ICsxNDMsNiBAQCBzdGF0aWMgdm9pZCBtdGtf ZGRwX2Nsa19kaXNhYmxlKHN0cnVjdCBkZXZpY2UgKmRldikNCj4gIAljbGtfZGlzYWJsZV91bnBy ZXBhcmUocHJpdi0+Y2xrKTsNCj4gIH0NCj4gIA0KPiAtDQo+ICB2b2lkIG10a19kaXRoZXJfc2V0 X2NvbW1vbih2b2lkIF9faW9tZW0gKnJlZ3MsIHN0cnVjdCBjbWRxX2NsaWVudF9yZWcgKmNtZHFf cmVnLA0KPiAgCQkJICAgdW5zaWduZWQgaW50IGJwYywgdW5zaWduZWQgaW50IENGRywgc3RydWN0 IGNtZHFfcGt0ICpjbWRxX3BrdCkNCj4gIHsNCj4gQEAgLTIxOSw2ICsyMTAsMTMgQEAgc3RhdGlj IHZvaWQgbXRrX2FhbF9jb25maWcoc3RydWN0IGRldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgdywN Cj4gIAltdGtfZGRwX3dyaXRlKGNtZHFfcGt0LCB3IDw8IDE2IHwgaCwgJnByaXYtPmNtZHFfcmVn LCBwcml2LT5yZWdzLCBESVNQX0FBTF9TSVpFKTsNCj4gIH0NCj4gIA0KPiArc3RhdGljIHZvaWQg bXRrX2FhbF9nYW1tYV9zZXQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKnN0YXRlKQ0KPiArew0KPiArCXN0cnVjdCBtdGtfZGRwX2NvbXBfZGV2ICpwcml2ID0gZGV2 X2dldF9kcnZkYXRhKGRldik7DQo+ICsNCj4gKyAgICAgICAgbXRrX2dhbW1hX3NldF9jb21tb24o cHJpdi0+cmVncywgc3RhdGUpOw0KPiArfQ0KPiArDQo+ICBzdGF0aWMgdm9pZCBtdGtfYWFsX3N0 YXJ0KHN0cnVjdCBkZXZpY2UgKmRldikNCj4gIHsNCj4gIAlzdHJ1Y3QgbXRrX2RkcF9jb21wX2Rl diAqcHJpdiA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOw0KPiBAQCAtMzMzLDU4ICszMzEsMTAgQEAg c3RhdGljIHZvaWQgbXRrX2RpdGhlcl9zdG9wKHN0cnVjdCBkZXZpY2UgKmRldikNCj4gIAl3cml0 ZWxfcmVsYXhlZCgweDAsIHByaXYtPnJlZ3MgKyBESVNQX0RJVEhFUl9FTik7DQo+ICB9DQo+ICAN Cj4gLXN0YXRpYyB2b2lkIG10a19nYW1tYV9jb25maWcoc3RydWN0IGRldmljZSAqZGV2LCB1bnNp Z25lZCBpbnQgdywNCj4gLQkJCSAgICAgdW5zaWduZWQgaW50IGgsIHVuc2lnbmVkIGludCB2cmVm cmVzaCwNCj4gLQkJCSAgICAgdW5zaWduZWQgaW50IGJwYywgc3RydWN0IGNtZHFfcGt0ICpjbWRx X3BrdCkNCj4gLXsNCj4gLQlzdHJ1Y3QgbXRrX2RkcF9jb21wX2RldiAqcHJpdiA9IGRldl9nZXRf ZHJ2ZGF0YShkZXYpOw0KPiAtDQo+IC0JbXRrX2RkcF93cml0ZShjbWRxX3BrdCwgaCA8PCAxNiB8 IHcsICZwcml2LT5jbWRxX3JlZywgcHJpdi0+cmVncywgRElTUF9HQU1NQV9TSVpFKTsNCj4gLQlt dGtfZGl0aGVyX3NldChkZXYsIGJwYywgRElTUF9HQU1NQV9DRkcsIGNtZHFfcGt0KTsNCj4gLX0N Cj4gLQ0KPiAtc3RhdGljIHZvaWQgbXRrX2dhbW1hX3N0YXJ0KHN0cnVjdCBkZXZpY2UgKmRldikN Cj4gLXsNCj4gLQlzdHJ1Y3QgbXRrX2RkcF9jb21wX2RldiAqcHJpdiA9IGRldl9nZXRfZHJ2ZGF0 YShkZXYpOw0KPiAtDQo+IC0Jd3JpdGVsKEdBTU1BX0VOLCBwcml2LT5yZWdzICArIERJU1BfR0FN TUFfRU4pOw0KPiAtfQ0KPiAtDQo+IC1zdGF0aWMgdm9pZCBtdGtfZ2FtbWFfc3RvcChzdHJ1Y3Qg ZGV2aWNlICpkZXYpDQo+IC17DQo+IC0Jc3RydWN0IG10a19kZHBfY29tcF9kZXYgKnByaXYgPSBk ZXZfZ2V0X2RydmRhdGEoZGV2KTsNCj4gLQ0KPiAtCXdyaXRlbF9yZWxheGVkKDB4MCwgcHJpdi0+ cmVncyAgKyBESVNQX0dBTU1BX0VOKTsNCj4gLX0NCj4gLQ0KPiAtc3RhdGljIHZvaWQgbXRrX2dh bW1hX3NldChzdHJ1Y3QgZGV2aWNlICpkZXYsDQo+IC0JCQkgIHN0cnVjdCBkcm1fY3J0Y19zdGF0 ZSAqc3RhdGUpDQo+IC17DQo+IC0Jc3RydWN0IG10a19kZHBfY29tcF9kZXYgKnByaXYgPSBkZXZf Z2V0X2RydmRhdGEoZGV2KTsNCj4gLQl1bnNpZ25lZCBpbnQgaSwgcmVnOw0KPiAtCXN0cnVjdCBk cm1fY29sb3JfbHV0ICpsdXQ7DQo+IC0Jdm9pZCBfX2lvbWVtICpsdXRfYmFzZTsNCj4gLQl1MzIg d29yZDsNCj4gLQ0KPiAtCWlmIChzdGF0ZS0+Z2FtbWFfbHV0KSB7DQo+IC0JCXJlZyA9IHJlYWRs KHByaXYtPnJlZ3MgKyBESVNQX0dBTU1BX0NGRyk7DQo+IC0JCXJlZyA9IHJlZyB8IEdBTU1BX0xV VF9FTjsNCj4gLQkJd3JpdGVsKHJlZywgcHJpdi0+cmVncyArIERJU1BfR0FNTUFfQ0ZHKTsNCj4g LQkJbHV0X2Jhc2UgPSBwcml2LT5yZWdzICsgRElTUF9HQU1NQV9MVVQ7DQo+IC0JCWx1dCA9IChz dHJ1Y3QgZHJtX2NvbG9yX2x1dCAqKXN0YXRlLT5nYW1tYV9sdXQtPmRhdGE7DQo+IC0JCWZvciAo aSA9IDA7IGkgPCBNVEtfTFVUX1NJWkU7IGkrKykgew0KPiAtCQkJd29yZCA9ICgoKGx1dFtpXS5y ZWQgPj4gNikgJiBMVVRfMTBCSVRfTUFTSykgPDwgMjApICsNCj4gLQkJCQkoKChsdXRbaV0uZ3Jl ZW4gPj4gNikgJiBMVVRfMTBCSVRfTUFTSykgPDwgMTApICsNCj4gLQkJCQkoKGx1dFtpXS5ibHVl ID4+IDYpICYgTFVUXzEwQklUX01BU0spOw0KPiAtCQkJd3JpdGVsKHdvcmQsIChsdXRfYmFzZSAr IGkgKiA0KSk7DQo+IC0JCX0NCj4gLQl9DQo+IC19DQo+IC0NCj4gIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgbXRrX2RkcF9jb21wX2Z1bmNzIGRkcF9hYWwgPSB7DQo+ICAJLmNsa19lbmFibGUgPSBtdGtf ZGRwX2Nsa19lbmFibGUsDQo+ICAJLmNsa19kaXNhYmxlID0gbXRrX2RkcF9jbGtfZGlzYWJsZSwN Cj4gLQkuZ2FtbWFfc2V0ID0gbXRrX2dhbW1hX3NldCwNCj4gKwkuZ2FtbWFfc2V0ID0gbXRrX2Fh bF9nYW1tYV9zZXQsDQo+ICAJLmNvbmZpZyA9IG10a19hYWxfY29uZmlnLA0KPiAgCS5zdGFydCA9 IG10a19hYWxfc3RhcnQsDQo+ICAJLnN0b3AgPSBtdGtfYWFsX3N0b3AsDQo+IEBAIC00MjUsOCAr Mzc1LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfZGRwX2NvbXBfZnVuY3MgZGRwX2RzaSA9 IHsNCj4gIH07DQo+ICANCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbXRrX2RkcF9jb21wX2Z1bmNz IGRkcF9nYW1tYSA9IHsNCj4gLQkuY2xrX2VuYWJsZSA9IG10a19kZHBfY2xrX2VuYWJsZSwNCj4g LQkuY2xrX2Rpc2FibGUgPSBtdGtfZGRwX2Nsa19kaXNhYmxlLA0KPiArCS5jbGtfZW5hYmxlID0g bXRrX2dhbW1hX2Nsa19lbmFibGUsDQo+ICsJLmNsa19kaXNhYmxlID0gbXRrX2dhbW1hX2Nsa19k aXNhYmxlLA0KPiAgCS5nYW1tYV9zZXQgPSBtdGtfZ2FtbWFfc2V0LA0KPiAgCS5jb25maWcgPSBt dGtfZ2FtbWFfY29uZmlnLA0KPiAgCS5zdGFydCA9IG10a19nYW1tYV9zdGFydCwNCj4gQEAgLTY0 Miw2ICs1OTIsNyBAQCBpbnQgbXRrX2RkcF9jb21wX2luaXQoc3RydWN0IGRldmljZV9ub2RlICpu b2RlLCBzdHJ1Y3QgbXRrX2RkcF9jb21wICpjb21wLA0KPiAgDQo+ICAJaWYgKHR5cGUgPT0gTVRL X0RJU1BfQkxTIHx8DQo+ICAJICAgIHR5cGUgPT0gTVRLX0RJU1BfQ09MT1IgfHwNCj4gKwkgICAg dHlwZSA9PSBNVEtfRElTUF9HQU1NQSB8fA0KPiAgCSAgICB0eXBlID09IE1US19EUEkgfHwNCj4g IAkgICAgdHlwZSA9PSBNVEtfRFNJIHx8DQo+ICAJICAgIHR5cGUgPT0gTVRLX0RJU1BfT1ZMIHx8 DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuYyBi L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jDQo+IGluZGV4IDVkMzlkZDU0 MjU1ZDEuLjI3OWQzZTZmMTE1NjMgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRp YXRlay9tdGtfZHJtX2Rydi5jDQo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtf ZHJtX2Rydi5jDQo+IEBAIC00ODYsMTEgKzQ4NiwxMiBAQCBzdGF0aWMgaW50IG10a19kcm1fcHJv YmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikNCj4gIAkJcHJpdmF0ZS0+Y29tcF9ub2Rl W2NvbXBfaWRdID0gb2Zfbm9kZV9nZXQobm9kZSk7DQo+ICANCj4gIAkJLyoNCj4gLQkJICogQ3Vy cmVudGx5IG9ubHkgdGhlIENPTE9SLCBPVkwsIFJETUEsIERTSSwgYW5kIERQSSBibG9ja3MgaGF2 ZQ0KPiArCQkgKiBDdXJyZW50bHkgb25seSB0aGUgQ09MT1IsIEdBTU1BLCBPVkwsIFJETUEsIERT SSwgYW5kIERQSSBibG9ja3MgaGF2ZQ0KPiAgCQkgKiBzZXBhcmF0ZSBjb21wb25lbnQgcGxhdGZv cm0gZHJpdmVycyBhbmQgaW5pdGlhbGl6ZSB0aGVpciBvd24NCj4gIAkJICogRERQIGNvbXBvbmVu dCBzdHJ1Y3R1cmUuIFRoZSBvdGhlcnMgYXJlIGluaXRpYWxpemVkIGhlcmUuDQo+ICAJCSAqLw0K PiAgCQlpZiAoY29tcF90eXBlID09IE1US19ESVNQX0NPTE9SIHx8DQo+ICsJCSAgICBjb21wX3R5 cGUgPT0gTVRLX0RJU1BfR0FNTUEgfHwNCj4gIAkJICAgIGNvbXBfdHlwZSA9PSBNVEtfRElTUF9P VkwgfHwNCj4gIAkJICAgIGNvbXBfdHlwZSA9PSBNVEtfRElTUF9PVkxfMkwgfHwNCj4gIAkJICAg IGNvbXBfdHlwZSA9PSBNVEtfRElTUF9SRE1BIHx8DQo+IEBAIC01ODksNiArNTkwLDcgQEAgc3Rh dGljIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2RybV9wbGF0Zm9ybV9kcml2ZXIgPSB7DQo+ ICANCj4gIHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyICogY29uc3QgbXRrX2RybV9kcml2 ZXJzW10gPSB7DQo+ICAJJm10a19kaXNwX2NvbG9yX2RyaXZlciwNCj4gKwkmbXRrX2Rpc3BfZ2Ft bWFfZHJpdmVyLA0KPiAgCSZtdGtfZGlzcF9vdmxfZHJpdmVyLA0KPiAgCSZtdGtfZGlzcF9yZG1h X2RyaXZlciwNCj4gIAkmbXRrX2RwaV9kcml2ZXIsDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9t dGtfZHJtX2Rydi5oDQo+IGluZGV4IGU4MjM4ZmE0YWEyYWMuLjBlNTRlM2Q1MTAxNGEgMTAwNjQ0 DQo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5oDQo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5oDQo+IEBAIC00Nyw2ICs0Nyw3 IEBAIHN0cnVjdCBtdGtfZHJtX3ByaXZhdGUgew0KPiAgfTsNCj4gIA0KPiAgZXh0ZXJuIHN0cnVj dCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2Rpc3BfY29sb3JfZHJpdmVyOw0KPiArZXh0ZXJuIHN0cnVj dCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2Rpc3BfZ2FtbWFfZHJpdmVyOw0KPiAgZXh0ZXJuIHN0cnVj dCBwbGF0Zm9ybV9kcml2ZXIgbXRrX2Rpc3Bfb3ZsX2RyaXZlcjsNCj4gIGV4dGVybiBzdHJ1Y3Qg cGxhdGZvcm1fZHJpdmVyIG10a19kaXNwX3JkbWFfZHJpdmVyOw0KPiAgZXh0ZXJuIHN0cnVjdCBw bGF0Zm9ybV9kcml2ZXIgbXRrX2RwaV9kcml2ZXI7DQoNCg== 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=-12.2 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 26406C433E0 for ; Thu, 28 Jan 2021 05:34:06 +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 A4DBA64DCE for ; Thu, 28 Jan 2021 05:34:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4DBA64DCE 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 5C1F76E8D0; Thu, 28 Jan 2021 05:34:04 +0000 (UTC) Received: from mailgw02.mediatek.com (unknown [1.203.163.81]) by gabe.freedesktop.org (Postfix) with ESMTP id 05BE66E8D0 for ; Thu, 28 Jan 2021 05:34:01 +0000 (UTC) X-UUID: e421a2ab60a24209bad38817ef9a8a9c-20210128 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=YE9IqQ50ZpT8YURQ2js2UPrxNnQWoNPjEPrZqWAPV1w=; b=mUMqjWvFBSO4OiRXQg/8ErdgRbbM0nLF0lZ0unpT845VliYTK1QVt9uyUvGH6sJ07xuY7HXpWRwvLkaStKd+Nr7hSqtGL7Kuw2aan6cMdF3Th6tRfrOSznCNoeCtYbP79bTnmKjKPcRgnkAVJflf9MXSzAHxX95PWgsa8E7C0gg=; X-UUID: e421a2ab60a24209bad38817ef9a8a9c-20210128 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1597554940; Thu, 28 Jan 2021 13:33:58 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 28 Jan 2021 13:33:52 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 28 Jan 2021 13:33:52 +0800 Message-ID: <1611812032.28312.0.camel@mtksdaap41> Subject: Re: [PATCH v10 5/9] drm/mediatek: separate gamma module From: CK Hu To: Hsin-Yi Wang Date: Thu, 28 Jan 2021 13:33:52 +0800 In-Reply-To: <20210127045422.2418917-6-hsinyi@chromium.org> References: <20210127045422.2418917-1-hsinyi@chromium.org> <20210127045422.2418917-6-hsinyi@chromium.org> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: F7372C9677493752AB582EA8CAA11D72DB6212585926DC666EBD13B8797F14AD2000:8 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: Mark Rutland , devicetree@vger.kernel.org, David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Yongqiang Niu , Project_Global_Chrome_Upstream_Group@mediatek.com, linux-mediatek@lists.infradead.org, Matthias Brugger , 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, Hsin-Yi: On Wed, 2021-01-27 at 12:54 +0800, Hsin-Yi Wang wrote: > From: Yongqiang Niu > > mt8183 gamma module will different with mt8173 > separate gamma for add private data Reviewed-by: CK Hu > > Signed-off-by: Yongqiang Niu > Signed-off-by: Hsin-Yi Wang > --- > drivers/gpu/drm/mediatek/Makefile | 1 + > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 10 ++ > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 188 ++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 71 ++------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 214 insertions(+), 61 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index 01d06332f7679..b64674b944860 100644 > --- a/drivers/gpu/drm/mediatek/Makefile > +++ b/drivers/gpu/drm/mediatek/Makefile > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > > mediatek-drm-y := mtk_disp_color.o \ > + mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > mtk_disp_rdma.o \ > mtk_drm_crtc.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index c50d5fc9fd349..c1e658b490b6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -27,6 +27,16 @@ void mtk_dpi_stop(struct device *dev); > void mtk_dsi_ddp_start(struct device *dev); > void mtk_dsi_ddp_stop(struct device *dev); > > +int mtk_gamma_clk_enable(struct device *dev); > +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); > +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_start(struct device *dev); > +void mtk_gamma_stop(struct device *dev); > + > void mtk_ovl_bgclr_in_on(struct device *dev); > void mtk_ovl_bgclr_in_off(struct device *dev); > void mtk_ovl_bypass_shadow(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > new file mode 100644 > index 0000000000000..b5a499d7e472c > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -0,0 +1,188 @@ > +/* > + * SPDX-License-Identifier: > + * > + * Copyright (c) 2020 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_GAMMA_EN 0x0000 > +#define GAMMA_EN BIT(0) > +#define DISP_GAMMA_CFG 0x0020 > +#define GAMMA_LUT_EN BIT(1) > +#define DISP_GAMMA_SIZE 0x0030 > +#define DISP_GAMMA_LUT 0x0700 > + > +#define LUT_10BIT_MASK 0x03ff > + > +struct mtk_disp_gamma_data { > + u32 reserved; > +}; > + > +/** > + * struct mtk_disp_gamma - DISP_GAMMA driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_gamma { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_gamma_data *data; > +}; > + > +int mtk_gamma_clk_enable(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + return clk_prepare_enable(gamma->clk); > +} > + > +void mtk_gamma_clk_disable(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + clk_disable_unprepare(gamma->clk); > +} > + > +void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state) > +{ > + unsigned int i, reg; > + struct drm_color_lut *lut; > + void __iomem *lut_base; > + u32 word; > + > + if (state->gamma_lut) { > + reg = readl(regs + DISP_GAMMA_CFG); > + reg = reg | GAMMA_LUT_EN; > + writel(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)); > + } > + } > +} > + > +void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + mtk_gamma_set_common(gamma->regs, state); > +} > + > +void mtk_gamma_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, h << 16 | w, &gamma->cmdq_reg, gamma->regs, > + DISP_GAMMA_SIZE); > + mtk_dither_set_common(gamma->regs, &gamma->cmdq_reg, bpc, DISP_GAMMA_CFG, cmdq_pkt); > +} > + > +void mtk_gamma_start(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + writel(GAMMA_EN, gamma->regs + DISP_GAMMA_EN); > +} > + > +void mtk_gamma_stop(struct device *dev) > +{ > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, gamma->regs + DISP_GAMMA_EN); > +} > + > +static int mtk_disp_gamma_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_gamma_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_gamma_component_ops = { > + .bind = mtk_disp_gamma_bind, > + .unbind = mtk_disp_gamma_unbind, > +}; > + > +static int mtk_disp_gamma_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_gamma *priv; > + struct resource *res; > + int ret; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->clk = devm_clk_get(dev, NULL); > + if (IS_ERR(priv->clk)) { > + dev_err(dev, "failed to get gamma clk\n"); > + return PTR_ERR(priv->clk); > + } > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + priv->regs = devm_ioremap_resource(dev, res); > + if (IS_ERR(priv->regs)) { > + dev_err(dev, "failed to ioremap gamma\n"); > + return PTR_ERR(priv->regs); > + } > + > +#if IS_REACHABLE(CONFIG_MTK_CMDQ) > + ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > + if (ret) > + dev_dbg(dev, "get mediatek,gce-client-reg fail!\n"); > +#endif > + > + priv->data = of_device_get_match_data(dev); > + platform_set_drvdata(pdev, priv); > + > + ret = component_add(dev, &mtk_disp_gamma_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_gamma_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_gamma_component_ops); > + > + return 0; > +} > + > +static const struct of_device_id mtk_disp_gamma_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-gamma"}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match); > + > +struct platform_driver mtk_disp_gamma_driver = { > + .probe = mtk_disp_gamma_probe, > + .remove = mtk_disp_gamma_remove, > + .driver = { > + .name = "mediatek-disp-gamma", > + .owner = THIS_MODULE, > + .of_match_table = mtk_disp_gamma_driver_dt_match, > + }, > +}; > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 53d25823a37cc..8173f709272be 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -55,11 +55,6 @@ > #define DITHER_RELAY_MODE BIT(0) > #define DISP_DITHER_SIZE 0x0030 > > -#define DISP_GAMMA_EN 0x0000 > -#define DISP_GAMMA_CFG 0x0020 > -#define DISP_GAMMA_SIZE 0x0030 > -#define DISP_GAMMA_LUT 0x0700 > - > #define LUT_10BIT_MASK 0x03ff > > #define OD_RELAYMODE BIT(0) > @@ -68,9 +63,6 @@ > > #define AAL_EN BIT(0) > > -#define GAMMA_EN BIT(0) > -#define GAMMA_LUT_EN BIT(1) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -151,7 +143,6 @@ static void mtk_ddp_clk_disable(struct device *dev) > clk_disable_unprepare(priv->clk); > } > > - > void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg, > unsigned int bpc, unsigned int CFG, struct cmdq_pkt *cmdq_pkt) > { > @@ -219,6 +210,13 @@ static void mtk_aal_config(struct device *dev, unsigned int w, > mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE); > } > > +static void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > + > + mtk_gamma_set_common(priv->regs, state); > +} > + > static void mtk_aal_start(struct device *dev) > { > struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > @@ -333,58 +331,10 @@ static void mtk_dither_stop(struct device *dev) > writel_relaxed(0x0, priv->regs + DISP_DITHER_EN); > } > > -static void mtk_gamma_config(struct device *dev, unsigned int w, > - unsigned int h, unsigned int vrefresh, > - unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - mtk_ddp_write(cmdq_pkt, h << 16 | w, &priv->cmdq_reg, priv->regs, DISP_GAMMA_SIZE); > - mtk_dither_set(dev, bpc, DISP_GAMMA_CFG, cmdq_pkt); > -} > - > -static void mtk_gamma_start(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel(GAMMA_EN, priv->regs + DISP_GAMMA_EN); > -} > - > -static void mtk_gamma_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_GAMMA_EN); > -} > - > -static void mtk_gamma_set(struct device *dev, > - struct drm_crtc_state *state) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - unsigned int i, reg; > - struct drm_color_lut *lut; > - void __iomem *lut_base; > - u32 word; > - > - if (state->gamma_lut) { > - reg = readl(priv->regs + DISP_GAMMA_CFG); > - reg = reg | GAMMA_LUT_EN; > - writel(reg, priv->regs + DISP_GAMMA_CFG); > - lut_base = priv->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)); > - } > - } > -} > - > static const struct mtk_ddp_comp_funcs ddp_aal = { > .clk_enable = mtk_ddp_clk_enable, > .clk_disable = mtk_ddp_clk_disable, > - .gamma_set = mtk_gamma_set, > + .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > .stop = mtk_aal_stop, > @@ -425,8 +375,8 @@ static const struct mtk_ddp_comp_funcs ddp_dsi = { > }; > > static const struct mtk_ddp_comp_funcs ddp_gamma = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_gamma_clk_enable, > + .clk_disable = mtk_gamma_clk_disable, > .gamma_set = mtk_gamma_set, > .config = mtk_gamma_config, > .start = mtk_gamma_start, > @@ -642,6 +592,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, > > if (type == MTK_DISP_BLS || > type == MTK_DISP_COLOR || > + type == MTK_DISP_GAMMA || > type == MTK_DPI || > type == MTK_DSI || > type == MTK_DISP_OVL || > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 5d39dd54255d1..279d3e6f11563 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -486,11 +486,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the COLOR, OVL, RDMA, DSI, and DPI blocks have > + * Currently only the COLOR, GAMMA, OVL, RDMA, DSI, and DPI blocks have > * separate component platform drivers and initialize their own > * DDP component structure. The others are initialized here. > */ > if (comp_type == MTK_DISP_COLOR || > + comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > comp_type == MTK_DISP_OVL_2L || > comp_type == MTK_DISP_RDMA || > @@ -589,6 +590,7 @@ static struct platform_driver mtk_drm_platform_driver = { > > static struct platform_driver * const mtk_drm_drivers[] = { > &mtk_disp_color_driver, > + &mtk_disp_gamma_driver, > &mtk_disp_ovl_driver, > &mtk_disp_rdma_driver, > &mtk_dpi_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index e8238fa4aa2ac..0e54e3d51014a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -47,6 +47,7 @@ struct mtk_drm_private { > }; > > extern struct platform_driver mtk_disp_color_driver; > +extern struct platform_driver mtk_disp_gamma_driver; > extern struct platform_driver mtk_disp_ovl_driver; > extern struct platform_driver mtk_disp_rdma_driver; > extern struct platform_driver mtk_dpi_driver; _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel