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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 793FDC07E95 for ; Fri, 16 Jul 2021 05:41:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 589AD613D4 for ; Fri, 16 Jul 2021 05:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234244AbhGPFoa (ORCPT ); Fri, 16 Jul 2021 01:44:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234204AbhGPFo3 (ORCPT ); Fri, 16 Jul 2021 01:44:29 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8752C061760 for ; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id k11so9328502ioa.5 for ; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=FbO4R18c6dPs1awbG0lG90gFJxibfGcZzhP2ICYaGZNAQ8lBQZ+nNfuOAFvHtLrBlK Cl23FSqRwmZObMo7iehSBas8bQQO3mKi8y4N8UfShgS45XHgLgiOOtCkK7titCSfnjE9 7ML4kXVC5UIIOdaZmRLbyfkvgyN1uo2LFuExg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=bXu6bkVaaAzDQq/ADQCCDlKPH/AnglfO9spHQEb7RZWo6LTIUi/vPRMsSbqj14CQLQ dOZeYqXoMiLl1hMYQRD9E0/TJHtcgnmnFDLTGv0JRrsTd8XStc4SeLY8uxNgD8B/gwez wr5XIZTCKNCqgFAXeYQqRbh0YDITXmgL8UmdSheUkHo2StOFB1WW+4pJzhd7l3sBsj2y xnLsOQkV+EOMg+LgnghSZfOatDaxX98Mv4K36JqIWRDrf4gMyBOzBE6Jxp5KMqgeoteB qVV2D4y0ISLHTuDKIMhONevm1o2tqcr5+oDR6LxO+85kxFNorqpjL4Mjmg8XeD36eTWC 2+1A== X-Gm-Message-State: AOAM531SN9S1Xh10E6q/Y4SkMAbFUzLBEdq+wrxakCKx4H76So1mp2P1 VcZDCYIV5P/TkQMkqFOgtV3vpnyq/peAlb3208PgDw== X-Google-Smtp-Source: ABdhPJwBF1ColsNS/SoK2NQDjnoDSSfgNIoYt1UOtKSuGmhulJf0pm+RJ25Qw/8eUcbUQgLA23Rvq7g/fu77Rtn+x7o= X-Received: by 2002:a02:6946:: with SMTP id e67mr7460482jac.4.1626414093158; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) MIME-Version: 1.0 References: <1626051778-13577-1-git-send-email-yongqiang.niu@mediatek.com> <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> In-Reply-To: <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> From: Hsin-Yi Wang Date: Fri, 16 Jul 2021 13:41:07 +0800 Message-ID: Subject: Re: [PATCH v2, 1/3] drm/mediatek: Separate aal module To: Yongqiang Niu Cc: Chun-Kuang Hu , Rob Herring , Matthias Brugger , Philipp Zabel , David Airlie , Daniel Vetter , Jassi Brar , Fabien Parent , Dennis YC Hsieh , Devicetree List , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , "moderated list:ARM/Mediatek SoC support" , lkml , dri-devel , Project_Global_Chrome_Upstream_Group@mediatek.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 12, 2021 at 9:03 AM Yongqiang Niu wrote: > > mt8183 aal has no gamma function > > Signed-off-by: Yongqiang Niu > --- > drivers/gpu/drm/mediatek/Makefile | 3 +- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 166 ++++++++++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 9 ++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 39 +------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 184 insertions(+), 40 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_aal.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index dc54a7a..29098d7 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_ccorr.o \ > +mediatek-drm-y := mtk_disp_aal.o \ > + mtk_disp_ccorr.o \ > mtk_disp_color.o \ > mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > new file mode 100644 > index 0000000..fb212e96 > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -0,0 +1,166 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2021 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_AAL_EN 0x0000 > +#define AAL_EN BIT(0) > +#define DISP_AAL_SIZE 0x0030 > + > + > +struct mtk_disp_aal_data { > + bool has_gamma; > +}; > + > +/** > + * struct mtk_disp_aal - DISP_AAL driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_aal { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_aal_data *data; > +}; > + > +int mtk_aal_clk_enable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + return clk_prepare_enable(aal->clk); > +} > + > +void mtk_aal_clk_disable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + clk_disable_unprepare(aal->clk); > +} > + > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE); > +} > + > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + if (aal->data && aal->data->has_gamma) > + mtk_gamma_set_common(aal->regs, state); > +} > + > +void mtk_aal_start(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel(AAL_EN, aal->regs + DISP_AAL_EN); > +} > + > +void mtk_aal_stop(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, aal->regs + DISP_AAL_EN); > +} > + > +static int mtk_disp_aal_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_aal_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_aal_component_ops = { > + .bind = mtk_disp_aal_bind, > + .unbind = mtk_disp_aal_unbind, > +}; > + > +static int mtk_disp_aal_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_aal *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 aal 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 aal\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_aal_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_aal_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_aal_component_ops); > + > + return 0; > +} > + > +static const struct mtk_disp_aal_data mt8173_aal_driver_data = { > + .has_gamma = true, > +}; > + > +static const struct of_device_id mtk_disp_aal_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-aal", > + .data = &mt8173_aal_driver_data}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match); > + > +struct platform_driver mtk_disp_aal_driver = { > + .probe = mtk_disp_aal_probe, > + .remove = mtk_disp_aal_remove, > + .driver = { > + .name = "mediatek-disp-aal", > + .owner = THIS_MODULE, > + .of_match_table = 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 cafd9df..86c3068 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -9,6 +9,15 @@ > #include > #include "mtk_drm_plane.h" > > +int mtk_aal_clk_enable(struct device *dev); > +void mtk_aal_clk_disable(struct device *dev); > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state); > +void mtk_aal_start(struct device *dev); > +void mtk_aal_stop(struct device *dev); > + > void mtk_ccorr_ctm_set(struct device *dev, struct drm_crtc_state *state); > int mtk_ccorr_clk_enable(struct device *dev); > void mtk_ccorr_clk_disable(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 75bc00e..f367142 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c in mtk_ddp_comp_init(), MTK_DISP_AAL should be skipped in the if() block to avoid creating priv again. @@ -435,7 +435,8 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, } comp->dev = &comp_pdev->dev; - if (type == MTK_DISP_BLS || + if (type == MTK_DISP_AAL || + type == MTK_DISP_BLS || type == MTK_DISP_CCORR || Otherwise we would see [ 0.216759] mediatek-drm mediatek-drm.1.auto: Adding component match for /soc/aal@14010000 [ 0.431996] platform 14010000.aal: Resources present before probing and the display is completely black. > @@ -32,9 +32,6 @@ > > #define DISP_REG_UFO_START 0x0000 > > -#define DISP_AAL_EN 0x0000 > -#define DISP_AAL_SIZE 0x0030 > - > #define DISP_DITHER_EN 0x0000 > #define DITHER_EN BIT(0) > #define DISP_DITHER_CFG 0x0020 > @@ -48,8 +45,6 @@ > > #define UFO_BYPASS BIT(2) > > -#define AAL_EN BIT(0) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -190,36 +185,6 @@ static void mtk_ufoe_start(struct device *dev) > writel(UFO_BYPASS, priv->regs + DISP_REG_UFO_START); > } > > -static void mtk_aal_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, 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); > - > - writel(AAL_EN, priv->regs + DISP_AAL_EN); > -} > - > -static void mtk_aal_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_AAL_EN); > -} > - > static void mtk_dither_config(struct device *dev, unsigned int w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > @@ -247,8 +212,8 @@ static void mtk_dither_stop(struct device *dev) > } > > static const struct mtk_ddp_comp_funcs ddp_aal = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_aal_clk_enable, > + .clk_disable = mtk_aal_clk_disable, > .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index b46bdb8..67a585e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -532,11 +532,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the CCORR, COLOR, GAMMA, OVL, RDMA, DSI, and DPI > + * Currently only the AAL, CCORR, 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_CCORR || > + if (comp_type == MTK_DISP_AAL || > + comp_type == MTK_DISP_CCORR || > comp_type == MTK_DISP_COLOR || > comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > @@ -636,6 +637,7 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, > }; > > static struct platform_driver * const mtk_drm_drivers[] = { > + &mtk_disp_aal_driver, > &mtk_disp_ccorr_driver, > &mtk_disp_color_driver, > &mtk_disp_gamma_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index 637f566..3e7d1e6 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -46,6 +46,7 @@ struct mtk_drm_private { > struct drm_atomic_state *suspend_state; > }; > > +extern struct platform_driver mtk_disp_aal_driver; > extern struct platform_driver mtk_disp_ccorr_driver; > extern struct platform_driver mtk_disp_color_driver; > extern struct platform_driver mtk_disp_gamma_driver; > -- > 1.8.1.1.dirty > 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7EFB9C07E95 for ; Fri, 16 Jul 2021 05:41:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 37E91613DF for ; Fri, 16 Jul 2021 05:41:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37E91613DF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rdYqJ/Jyt1zbGIfTe/KpVjA4/tS3GFpFOa9Hx8+vlNc=; b=VJF9rlScAPZAh0 DkwSGbllMFQMcXFTygsEuSCTxcBGjkQ6jqecFhtfMmj11YdtztIcKop3mwB/a75qCfNFHnlhTYhtx 7/D7cKjq+XF2LAvwBdfVOnSQ+mdTmK63CevkiWZq+5zIrFNouF/U6ZnWw6ZHzWhg5vuE2y8HyNXf8 JxNNrgiiN9Y0vVe0shw40m7DPAgXoRMUGTdc/6T0bSy37oND5gxS4YOz9RByavcpfV7e864s9vlEt GDXPVc60ZzWHCEnoAutpMQlnpnTQa0g6KnUj9mQ3hpb+SQ8L22MHZN9wvZBMSgBgn6ZuZoNmt13WW AK5cx/Ix+bnpdCp3vcHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4GbS-003GAC-SP; Fri, 16 Jul 2021 05:41:38 +0000 Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4GbP-003G7A-DD for linux-mediatek@lists.infradead.org; Fri, 16 Jul 2021 05:41:37 +0000 Received: by mail-io1-xd36.google.com with SMTP id l5so9328386iok.7 for ; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=FbO4R18c6dPs1awbG0lG90gFJxibfGcZzhP2ICYaGZNAQ8lBQZ+nNfuOAFvHtLrBlK Cl23FSqRwmZObMo7iehSBas8bQQO3mKi8y4N8UfShgS45XHgLgiOOtCkK7titCSfnjE9 7ML4kXVC5UIIOdaZmRLbyfkvgyN1uo2LFuExg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=IbVCcCiZNhfqEBs/LHmiI9Z0MFFNsoVRAskM9Hk8ujQZm9MXjPXHd1gKl+/7LJcIXU J9jepeWUGpA5KwBX5E/JVtxj1RA0/5MfcKucjIX6zwne/JaD1/ds7jShCzzYzfvgHBnv VmIT5tOo7CpFMvToGrK1LyZGKYuQqjv4MKB+stQd+byhvb/MfUjkSbt1Gqy4N0BO9cqq uyboHo1yCfI4NiC07LgLr8DvgaPluywx91p5r8EajIuzLlOr+VtjQqWcZK+CDhGTO1g6 xWeUJt78gZFTLQkuFlaOb3IRFkU6bGRhlW3Pgcg7dKZNmIm7+2CqNqpn1cIuyQzv7Zm7 0kSg== X-Gm-Message-State: AOAM533j8D361aJrzDfvHwuW9mJd+wF+p//50kKWQJrWricm7EfvBO5D dnCPC+iHDWE3Xm+vUiWjhRNCFYcVOeXHdx+ZSoVvnA== X-Google-Smtp-Source: ABdhPJwBF1ColsNS/SoK2NQDjnoDSSfgNIoYt1UOtKSuGmhulJf0pm+RJ25Qw/8eUcbUQgLA23Rvq7g/fu77Rtn+x7o= X-Received: by 2002:a02:6946:: with SMTP id e67mr7460482jac.4.1626414093158; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) MIME-Version: 1.0 References: <1626051778-13577-1-git-send-email-yongqiang.niu@mediatek.com> <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> In-Reply-To: <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> From: Hsin-Yi Wang Date: Fri, 16 Jul 2021 13:41:07 +0800 Message-ID: Subject: Re: [PATCH v2, 1/3] drm/mediatek: Separate aal module To: Yongqiang Niu Cc: Chun-Kuang Hu , Rob Herring , Matthias Brugger , Philipp Zabel , David Airlie , Daniel Vetter , Jassi Brar , Fabien Parent , Dennis YC Hsieh , Devicetree List , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , "moderated list:ARM/Mediatek SoC support" , lkml , dri-devel , Project_Global_Chrome_Upstream_Group@mediatek.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210715_224135_545753_6CBA60BE X-CRM114-Status: GOOD ( 32.79 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Mon, Jul 12, 2021 at 9:03 AM Yongqiang Niu wrote: > > mt8183 aal has no gamma function > > Signed-off-by: Yongqiang Niu > --- > drivers/gpu/drm/mediatek/Makefile | 3 +- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 166 ++++++++++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 9 ++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 39 +------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 184 insertions(+), 40 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_aal.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index dc54a7a..29098d7 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_ccorr.o \ > +mediatek-drm-y := mtk_disp_aal.o \ > + mtk_disp_ccorr.o \ > mtk_disp_color.o \ > mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > new file mode 100644 > index 0000000..fb212e96 > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -0,0 +1,166 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2021 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_AAL_EN 0x0000 > +#define AAL_EN BIT(0) > +#define DISP_AAL_SIZE 0x0030 > + > + > +struct mtk_disp_aal_data { > + bool has_gamma; > +}; > + > +/** > + * struct mtk_disp_aal - DISP_AAL driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_aal { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_aal_data *data; > +}; > + > +int mtk_aal_clk_enable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + return clk_prepare_enable(aal->clk); > +} > + > +void mtk_aal_clk_disable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + clk_disable_unprepare(aal->clk); > +} > + > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE); > +} > + > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + if (aal->data && aal->data->has_gamma) > + mtk_gamma_set_common(aal->regs, state); > +} > + > +void mtk_aal_start(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel(AAL_EN, aal->regs + DISP_AAL_EN); > +} > + > +void mtk_aal_stop(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, aal->regs + DISP_AAL_EN); > +} > + > +static int mtk_disp_aal_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_aal_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_aal_component_ops = { > + .bind = mtk_disp_aal_bind, > + .unbind = mtk_disp_aal_unbind, > +}; > + > +static int mtk_disp_aal_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_aal *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 aal 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 aal\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_aal_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_aal_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_aal_component_ops); > + > + return 0; > +} > + > +static const struct mtk_disp_aal_data mt8173_aal_driver_data = { > + .has_gamma = true, > +}; > + > +static const struct of_device_id mtk_disp_aal_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-aal", > + .data = &mt8173_aal_driver_data}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match); > + > +struct platform_driver mtk_disp_aal_driver = { > + .probe = mtk_disp_aal_probe, > + .remove = mtk_disp_aal_remove, > + .driver = { > + .name = "mediatek-disp-aal", > + .owner = THIS_MODULE, > + .of_match_table = 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 cafd9df..86c3068 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -9,6 +9,15 @@ > #include > #include "mtk_drm_plane.h" > > +int mtk_aal_clk_enable(struct device *dev); > +void mtk_aal_clk_disable(struct device *dev); > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state); > +void mtk_aal_start(struct device *dev); > +void mtk_aal_stop(struct device *dev); > + > void mtk_ccorr_ctm_set(struct device *dev, struct drm_crtc_state *state); > int mtk_ccorr_clk_enable(struct device *dev); > void mtk_ccorr_clk_disable(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 75bc00e..f367142 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c in mtk_ddp_comp_init(), MTK_DISP_AAL should be skipped in the if() block to avoid creating priv again. @@ -435,7 +435,8 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, } comp->dev = &comp_pdev->dev; - if (type == MTK_DISP_BLS || + if (type == MTK_DISP_AAL || + type == MTK_DISP_BLS || type == MTK_DISP_CCORR || Otherwise we would see [ 0.216759] mediatek-drm mediatek-drm.1.auto: Adding component match for /soc/aal@14010000 [ 0.431996] platform 14010000.aal: Resources present before probing and the display is completely black. > @@ -32,9 +32,6 @@ > > #define DISP_REG_UFO_START 0x0000 > > -#define DISP_AAL_EN 0x0000 > -#define DISP_AAL_SIZE 0x0030 > - > #define DISP_DITHER_EN 0x0000 > #define DITHER_EN BIT(0) > #define DISP_DITHER_CFG 0x0020 > @@ -48,8 +45,6 @@ > > #define UFO_BYPASS BIT(2) > > -#define AAL_EN BIT(0) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -190,36 +185,6 @@ static void mtk_ufoe_start(struct device *dev) > writel(UFO_BYPASS, priv->regs + DISP_REG_UFO_START); > } > > -static void mtk_aal_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, 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); > - > - writel(AAL_EN, priv->regs + DISP_AAL_EN); > -} > - > -static void mtk_aal_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_AAL_EN); > -} > - > static void mtk_dither_config(struct device *dev, unsigned int w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > @@ -247,8 +212,8 @@ static void mtk_dither_stop(struct device *dev) > } > > static const struct mtk_ddp_comp_funcs ddp_aal = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_aal_clk_enable, > + .clk_disable = mtk_aal_clk_disable, > .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index b46bdb8..67a585e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -532,11 +532,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the CCORR, COLOR, GAMMA, OVL, RDMA, DSI, and DPI > + * Currently only the AAL, CCORR, 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_CCORR || > + if (comp_type == MTK_DISP_AAL || > + comp_type == MTK_DISP_CCORR || > comp_type == MTK_DISP_COLOR || > comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > @@ -636,6 +637,7 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, > }; > > static struct platform_driver * const mtk_drm_drivers[] = { > + &mtk_disp_aal_driver, > &mtk_disp_ccorr_driver, > &mtk_disp_color_driver, > &mtk_disp_gamma_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index 637f566..3e7d1e6 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -46,6 +46,7 @@ struct mtk_drm_private { > struct drm_atomic_state *suspend_state; > }; > > +extern struct platform_driver mtk_disp_aal_driver; > extern struct platform_driver mtk_disp_ccorr_driver; > extern struct platform_driver mtk_disp_color_driver; > extern struct platform_driver mtk_disp_gamma_driver; > -- > 1.8.1.1.dirty > _______________________________________________ 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=-14.4 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,URIBL_BLOCKED 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 40F0CC12002 for ; Fri, 16 Jul 2021 05:43:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 08D38613D4 for ; Fri, 16 Jul 2021 05:43:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 08D38613D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ULkiDz2pWyJl1HIuvtQRCvECf1WqArAbB33BKWXqLTY=; b=DGxWFTom3iVWxN mpxB/r9EO/KQQIUzUB6HFbr/7yL7QiZf/MUBLQqODLJO9AOK4JDDSPHd41YVxEHB+zomcS/c7ok2B Vek49/EhtVRp8MBrj4lIW9i2o0t4LMIzIiGz+zCFUQLh224Hms3k7f9EFmRcwc8oGoUuEw0u/t/bK Uoj/cVsY0lzialFq/nfcKCG6R3m2moifutc4IeOKWX6ISSlYNpTslwKtz6YWTv+rWefQ+BsEm3lTe a11Ig70nbERcTUCsqPVw4Bn+NWTx3uMKbk6FPnWIwNDssAk2XPYIs1G9k6LhCVEesLnjwupxWHlTF 2uVUAH4yRKqbPlQT6OUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4GbV-003GAU-Gt; Fri, 16 Jul 2021 05:41:41 +0000 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4GbP-003G7B-DE for linux-arm-kernel@lists.infradead.org; Fri, 16 Jul 2021 05:41:37 +0000 Received: by mail-io1-xd2b.google.com with SMTP id d9so9294132ioo.2 for ; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=FbO4R18c6dPs1awbG0lG90gFJxibfGcZzhP2ICYaGZNAQ8lBQZ+nNfuOAFvHtLrBlK Cl23FSqRwmZObMo7iehSBas8bQQO3mKi8y4N8UfShgS45XHgLgiOOtCkK7titCSfnjE9 7ML4kXVC5UIIOdaZmRLbyfkvgyN1uo2LFuExg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=g/2Nbe8ZxJzYDCPZIoNHrCw40XKywSITo4CImIXRK9e9bfxljv6PE5zSznVusDnpp+ ZM1pcb1aViksQUSx0ypvMYf07kUrwMsRW7FQJb+yHW94Cv+chunFlY3CVhy6UR0GPglj xC8Z+RGW8cMTrGWCEM1hIAHDO5DWPSsbIXeiO9duJXGGn7IuvfC/nWeKPxMIh0MnvIin zPL7YpLqAwf2DTmakM94aQ/UiuiQTZ21XX3XTbvBnnv0mcT/JKINMPgAJe3GgSHlCWiE nmtlzNs5CV+wqDqFFXzYZFUa72Qj4He7D/3oh1IoYfv2xznOVrErlpgnJoAKAPe6aHQe L84Q== X-Gm-Message-State: AOAM532WKa1l38AuZ9pkYefPY8McHS5HKVH3LdBVeVu8F0tFR7RLs674 KYzZAEckWHcghcTLm0XYC1z9el6NGqOCLVDvoEJbcA== X-Google-Smtp-Source: ABdhPJwBF1ColsNS/SoK2NQDjnoDSSfgNIoYt1UOtKSuGmhulJf0pm+RJ25Qw/8eUcbUQgLA23Rvq7g/fu77Rtn+x7o= X-Received: by 2002:a02:6946:: with SMTP id e67mr7460482jac.4.1626414093158; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) MIME-Version: 1.0 References: <1626051778-13577-1-git-send-email-yongqiang.niu@mediatek.com> <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> In-Reply-To: <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> From: Hsin-Yi Wang Date: Fri, 16 Jul 2021 13:41:07 +0800 Message-ID: Subject: Re: [PATCH v2, 1/3] drm/mediatek: Separate aal module To: Yongqiang Niu Cc: Chun-Kuang Hu , Rob Herring , Matthias Brugger , Philipp Zabel , David Airlie , Daniel Vetter , Jassi Brar , Fabien Parent , Dennis YC Hsieh , Devicetree List , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , "moderated list:ARM/Mediatek SoC support" , lkml , dri-devel , Project_Global_Chrome_Upstream_Group@mediatek.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210715_224135_546244_EACE4AC6 X-CRM114-Status: GOOD ( 33.97 ) 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 On Mon, Jul 12, 2021 at 9:03 AM Yongqiang Niu wrote: > > mt8183 aal has no gamma function > > Signed-off-by: Yongqiang Niu > --- > drivers/gpu/drm/mediatek/Makefile | 3 +- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 166 ++++++++++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 9 ++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 39 +------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 184 insertions(+), 40 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_aal.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index dc54a7a..29098d7 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_ccorr.o \ > +mediatek-drm-y := mtk_disp_aal.o \ > + mtk_disp_ccorr.o \ > mtk_disp_color.o \ > mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > new file mode 100644 > index 0000000..fb212e96 > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -0,0 +1,166 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2021 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_AAL_EN 0x0000 > +#define AAL_EN BIT(0) > +#define DISP_AAL_SIZE 0x0030 > + > + > +struct mtk_disp_aal_data { > + bool has_gamma; > +}; > + > +/** > + * struct mtk_disp_aal - DISP_AAL driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_aal { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_aal_data *data; > +}; > + > +int mtk_aal_clk_enable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + return clk_prepare_enable(aal->clk); > +} > + > +void mtk_aal_clk_disable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + clk_disable_unprepare(aal->clk); > +} > + > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE); > +} > + > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + if (aal->data && aal->data->has_gamma) > + mtk_gamma_set_common(aal->regs, state); > +} > + > +void mtk_aal_start(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel(AAL_EN, aal->regs + DISP_AAL_EN); > +} > + > +void mtk_aal_stop(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, aal->regs + DISP_AAL_EN); > +} > + > +static int mtk_disp_aal_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_aal_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_aal_component_ops = { > + .bind = mtk_disp_aal_bind, > + .unbind = mtk_disp_aal_unbind, > +}; > + > +static int mtk_disp_aal_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_aal *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 aal 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 aal\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_aal_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_aal_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_aal_component_ops); > + > + return 0; > +} > + > +static const struct mtk_disp_aal_data mt8173_aal_driver_data = { > + .has_gamma = true, > +}; > + > +static const struct of_device_id mtk_disp_aal_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-aal", > + .data = &mt8173_aal_driver_data}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match); > + > +struct platform_driver mtk_disp_aal_driver = { > + .probe = mtk_disp_aal_probe, > + .remove = mtk_disp_aal_remove, > + .driver = { > + .name = "mediatek-disp-aal", > + .owner = THIS_MODULE, > + .of_match_table = 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 cafd9df..86c3068 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -9,6 +9,15 @@ > #include > #include "mtk_drm_plane.h" > > +int mtk_aal_clk_enable(struct device *dev); > +void mtk_aal_clk_disable(struct device *dev); > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state); > +void mtk_aal_start(struct device *dev); > +void mtk_aal_stop(struct device *dev); > + > void mtk_ccorr_ctm_set(struct device *dev, struct drm_crtc_state *state); > int mtk_ccorr_clk_enable(struct device *dev); > void mtk_ccorr_clk_disable(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 75bc00e..f367142 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c in mtk_ddp_comp_init(), MTK_DISP_AAL should be skipped in the if() block to avoid creating priv again. @@ -435,7 +435,8 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, } comp->dev = &comp_pdev->dev; - if (type == MTK_DISP_BLS || + if (type == MTK_DISP_AAL || + type == MTK_DISP_BLS || type == MTK_DISP_CCORR || Otherwise we would see [ 0.216759] mediatek-drm mediatek-drm.1.auto: Adding component match for /soc/aal@14010000 [ 0.431996] platform 14010000.aal: Resources present before probing and the display is completely black. > @@ -32,9 +32,6 @@ > > #define DISP_REG_UFO_START 0x0000 > > -#define DISP_AAL_EN 0x0000 > -#define DISP_AAL_SIZE 0x0030 > - > #define DISP_DITHER_EN 0x0000 > #define DITHER_EN BIT(0) > #define DISP_DITHER_CFG 0x0020 > @@ -48,8 +45,6 @@ > > #define UFO_BYPASS BIT(2) > > -#define AAL_EN BIT(0) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -190,36 +185,6 @@ static void mtk_ufoe_start(struct device *dev) > writel(UFO_BYPASS, priv->regs + DISP_REG_UFO_START); > } > > -static void mtk_aal_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, 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); > - > - writel(AAL_EN, priv->regs + DISP_AAL_EN); > -} > - > -static void mtk_aal_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_AAL_EN); > -} > - > static void mtk_dither_config(struct device *dev, unsigned int w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > @@ -247,8 +212,8 @@ static void mtk_dither_stop(struct device *dev) > } > > static const struct mtk_ddp_comp_funcs ddp_aal = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_aal_clk_enable, > + .clk_disable = mtk_aal_clk_disable, > .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index b46bdb8..67a585e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -532,11 +532,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the CCORR, COLOR, GAMMA, OVL, RDMA, DSI, and DPI > + * Currently only the AAL, CCORR, 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_CCORR || > + if (comp_type == MTK_DISP_AAL || > + comp_type == MTK_DISP_CCORR || > comp_type == MTK_DISP_COLOR || > comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > @@ -636,6 +637,7 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, > }; > > static struct platform_driver * const mtk_drm_drivers[] = { > + &mtk_disp_aal_driver, > &mtk_disp_ccorr_driver, > &mtk_disp_color_driver, > &mtk_disp_gamma_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index 637f566..3e7d1e6 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -46,6 +46,7 @@ struct mtk_drm_private { > struct drm_atomic_state *suspend_state; > }; > > +extern struct platform_driver mtk_disp_aal_driver; > extern struct platform_driver mtk_disp_ccorr_driver; > extern struct platform_driver mtk_disp_color_driver; > extern struct platform_driver mtk_disp_gamma_driver; > -- > 1.8.1.1.dirty > _______________________________________________ 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=-13.6 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,URIBL_BLOCKED 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 30F45C636CA for ; Fri, 16 Jul 2021 05:41:36 +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 EB592613F2 for ; Fri, 16 Jul 2021 05:41:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB592613F2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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 E31096E90B; Fri, 16 Jul 2021 05:41:34 +0000 (UTC) Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by gabe.freedesktop.org (Postfix) with ESMTPS id E20C26E90B for ; Fri, 16 Jul 2021 05:41:33 +0000 (UTC) Received: by mail-io1-xd36.google.com with SMTP id u7so9300553ion.3 for ; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=FbO4R18c6dPs1awbG0lG90gFJxibfGcZzhP2ICYaGZNAQ8lBQZ+nNfuOAFvHtLrBlK Cl23FSqRwmZObMo7iehSBas8bQQO3mKi8y4N8UfShgS45XHgLgiOOtCkK7titCSfnjE9 7ML4kXVC5UIIOdaZmRLbyfkvgyN1uo2LFuExg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hVeiqlDQpWsqA051Fvf75Hm/Xj52EQN3m2hB85idz5Q=; b=aooQamV8ZsPW/CQIU9+mMXxvCtH5rHNnjpTop7ZKOE0mINOGIaxmwB6Jr8+9G+ZaTh MVOLRuGzqBhTcUENdzMKtNJm0ujIgDE6d1DTaUuMk68KKRoMxMg2eIWM+N1uAs2pbtv5 DlzG/rvXNDOWjf9tdnzq8yRSyMDK+IbtycEWaJQ6AjQUWUoVfIxNs47RvN/NSQARXfHU zZBaXH9txyDwDyV4Qm+QJYMFOxpUMzLkM+SRJbG0d/gLnTL880A9bg3Tvd8J+FOxJFME 9blF3ghsV+kSCISEAGZ6/FQz95EzZXobsBX4HOUsY9pJI2Oq7HzsAhyMDbLuZq6fl1Yr PuqQ== X-Gm-Message-State: AOAM532ROj/wwWEcbQdQh2eVw+sM7btWm/HZkD0CSPEjEpyAksaKlbO4 cbdhLMz5QiAPVIb1+XpcLHR1wRCrOSPAOzgwxWm4Hw== X-Google-Smtp-Source: ABdhPJwBF1ColsNS/SoK2NQDjnoDSSfgNIoYt1UOtKSuGmhulJf0pm+RJ25Qw/8eUcbUQgLA23Rvq7g/fu77Rtn+x7o= X-Received: by 2002:a02:6946:: with SMTP id e67mr7460482jac.4.1626414093158; Thu, 15 Jul 2021 22:41:33 -0700 (PDT) MIME-Version: 1.0 References: <1626051778-13577-1-git-send-email-yongqiang.niu@mediatek.com> <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> In-Reply-To: <1626051778-13577-2-git-send-email-yongqiang.niu@mediatek.com> From: Hsin-Yi Wang Date: Fri, 16 Jul 2021 13:41:07 +0800 Message-ID: Subject: Re: [PATCH v2, 1/3] drm/mediatek: Separate aal module To: Yongqiang Niu Content-Type: text/plain; charset="UTF-8" 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: Chun-Kuang Hu , Project_Global_Chrome_Upstream_Group@mediatek.com, Devicetree List , David Airlie , Jassi Brar , lkml , dri-devel , Dennis YC Hsieh , Fabien Parent , Rob Herring , "moderated list:ARM/Mediatek SoC support" , Matthias Brugger , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Jul 12, 2021 at 9:03 AM Yongqiang Niu wrote: > > mt8183 aal has no gamma function > > Signed-off-by: Yongqiang Niu > --- > drivers/gpu/drm/mediatek/Makefile | 3 +- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 166 ++++++++++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 9 ++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 39 +------ > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > 6 files changed, 184 insertions(+), 40 deletions(-) > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_aal.c > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile > index dc54a7a..29098d7 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_ccorr.o \ > +mediatek-drm-y := mtk_disp_aal.o \ > + mtk_disp_ccorr.o \ > mtk_disp_color.o \ > mtk_disp_gamma.o \ > mtk_disp_ovl.o \ > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > new file mode 100644 > index 0000000..fb212e96 > --- /dev/null > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -0,0 +1,166 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) 2021 MediaTek Inc. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mtk_disp_drv.h" > +#include "mtk_drm_crtc.h" > +#include "mtk_drm_ddp_comp.h" > + > +#define DISP_AAL_EN 0x0000 > +#define AAL_EN BIT(0) > +#define DISP_AAL_SIZE 0x0030 > + > + > +struct mtk_disp_aal_data { > + bool has_gamma; > +}; > + > +/** > + * struct mtk_disp_aal - DISP_AAL driver structure > + * @ddp_comp - structure containing type enum and hardware resources > + * @crtc - associated crtc to report irq events to > + */ > +struct mtk_disp_aal { > + struct clk *clk; > + void __iomem *regs; > + struct cmdq_client_reg cmdq_reg; > + const struct mtk_disp_aal_data *data; > +}; > + > +int mtk_aal_clk_enable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + return clk_prepare_enable(aal->clk); > +} > + > +void mtk_aal_clk_disable(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + clk_disable_unprepare(aal->clk); > +} > + > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE); > +} > + > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + if (aal->data && aal->data->has_gamma) > + mtk_gamma_set_common(aal->regs, state); > +} > + > +void mtk_aal_start(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel(AAL_EN, aal->regs + DISP_AAL_EN); > +} > + > +void mtk_aal_stop(struct device *dev) > +{ > + struct mtk_disp_aal *aal = dev_get_drvdata(dev); > + > + writel_relaxed(0x0, aal->regs + DISP_AAL_EN); > +} > + > +static int mtk_disp_aal_bind(struct device *dev, struct device *master, > + void *data) > +{ > + return 0; > +} > + > +static void mtk_disp_aal_unbind(struct device *dev, struct device *master, > + void *data) > +{ > +} > + > +static const struct component_ops mtk_disp_aal_component_ops = { > + .bind = mtk_disp_aal_bind, > + .unbind = mtk_disp_aal_unbind, > +}; > + > +static int mtk_disp_aal_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mtk_disp_aal *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 aal 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 aal\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_aal_component_ops); > + if (ret) > + dev_err(dev, "Failed to add component: %d\n", ret); > + > + return ret; > +} > + > +static int mtk_disp_aal_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &mtk_disp_aal_component_ops); > + > + return 0; > +} > + > +static const struct mtk_disp_aal_data mt8173_aal_driver_data = { > + .has_gamma = true, > +}; > + > +static const struct of_device_id mtk_disp_aal_driver_dt_match[] = { > + { .compatible = "mediatek,mt8173-disp-aal", > + .data = &mt8173_aal_driver_data}, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match); > + > +struct platform_driver mtk_disp_aal_driver = { > + .probe = mtk_disp_aal_probe, > + .remove = mtk_disp_aal_remove, > + .driver = { > + .name = "mediatek-disp-aal", > + .owner = THIS_MODULE, > + .of_match_table = 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 cafd9df..86c3068 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -9,6 +9,15 @@ > #include > #include "mtk_drm_plane.h" > > +int mtk_aal_clk_enable(struct device *dev); > +void mtk_aal_clk_disable(struct device *dev); > +void mtk_aal_config(struct device *dev, unsigned int w, > + unsigned int h, unsigned int vrefresh, > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > +void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state); > +void mtk_aal_start(struct device *dev); > +void mtk_aal_stop(struct device *dev); > + > void mtk_ccorr_ctm_set(struct device *dev, struct drm_crtc_state *state); > int mtk_ccorr_clk_enable(struct device *dev); > void mtk_ccorr_clk_disable(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 75bc00e..f367142 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c in mtk_ddp_comp_init(), MTK_DISP_AAL should be skipped in the if() block to avoid creating priv again. @@ -435,7 +435,8 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, } comp->dev = &comp_pdev->dev; - if (type == MTK_DISP_BLS || + if (type == MTK_DISP_AAL || + type == MTK_DISP_BLS || type == MTK_DISP_CCORR || Otherwise we would see [ 0.216759] mediatek-drm mediatek-drm.1.auto: Adding component match for /soc/aal@14010000 [ 0.431996] platform 14010000.aal: Resources present before probing and the display is completely black. > @@ -32,9 +32,6 @@ > > #define DISP_REG_UFO_START 0x0000 > > -#define DISP_AAL_EN 0x0000 > -#define DISP_AAL_SIZE 0x0030 > - > #define DISP_DITHER_EN 0x0000 > #define DITHER_EN BIT(0) > #define DISP_DITHER_CFG 0x0020 > @@ -48,8 +45,6 @@ > > #define UFO_BYPASS BIT(2) > > -#define AAL_EN BIT(0) > - > #define DISP_DITHERING BIT(2) > #define DITHER_LSB_ERR_SHIFT_R(x) (((x) & 0x7) << 28) > #define DITHER_OVFLW_BIT_R(x) (((x) & 0x7) << 24) > @@ -190,36 +185,6 @@ static void mtk_ufoe_start(struct device *dev) > writel(UFO_BYPASS, priv->regs + DISP_REG_UFO_START); > } > > -static void mtk_aal_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, 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); > - > - writel(AAL_EN, priv->regs + DISP_AAL_EN); > -} > - > -static void mtk_aal_stop(struct device *dev) > -{ > - struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev); > - > - writel_relaxed(0x0, priv->regs + DISP_AAL_EN); > -} > - > static void mtk_dither_config(struct device *dev, unsigned int w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > @@ -247,8 +212,8 @@ static void mtk_dither_stop(struct device *dev) > } > > static const struct mtk_ddp_comp_funcs ddp_aal = { > - .clk_enable = mtk_ddp_clk_enable, > - .clk_disable = mtk_ddp_clk_disable, > + .clk_enable = mtk_aal_clk_enable, > + .clk_disable = mtk_aal_clk_disable, > .gamma_set = mtk_aal_gamma_set, > .config = mtk_aal_config, > .start = mtk_aal_start, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index b46bdb8..67a585e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -532,11 +532,12 @@ static int mtk_drm_probe(struct platform_device *pdev) > private->comp_node[comp_id] = of_node_get(node); > > /* > - * Currently only the CCORR, COLOR, GAMMA, OVL, RDMA, DSI, and DPI > + * Currently only the AAL, CCORR, 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_CCORR || > + if (comp_type == MTK_DISP_AAL || > + comp_type == MTK_DISP_CCORR || > comp_type == MTK_DISP_COLOR || > comp_type == MTK_DISP_GAMMA || > comp_type == MTK_DISP_OVL || > @@ -636,6 +637,7 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend, > }; > > static struct platform_driver * const mtk_drm_drivers[] = { > + &mtk_disp_aal_driver, > &mtk_disp_ccorr_driver, > &mtk_disp_color_driver, > &mtk_disp_gamma_driver, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index 637f566..3e7d1e6 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -46,6 +46,7 @@ struct mtk_drm_private { > struct drm_atomic_state *suspend_state; > }; > > +extern struct platform_driver mtk_disp_aal_driver; > extern struct platform_driver mtk_disp_ccorr_driver; > extern struct platform_driver mtk_disp_color_driver; > extern struct platform_driver mtk_disp_gamma_driver; > -- > 1.8.1.1.dirty >