From patchwork Fri Mar 21 09:33:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UGF1bC1wbCBDaGVuICjpmbPmn4/pnJYp?= X-Patchwork-Id: 14025184 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DDB2EC35FFF for ; Fri, 21 Mar 2025 10:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8fPIEbSr/x96UkwYOjiufP/9onrTKMsAghpNqi9YKjk=; b=1iwNbZMdeUfQPT/+vXdO2FdLcB 9sF3MAcDzklOSvYfeddk/HTAM5YazBgXKS1YLFuaRwENCry5lyiHdWCFdTI32iEnUL5hD+3JAxzmI K89W7w1bObNSOoXujIo6baIJ+lUdOGXkA2KAmf7XuW6BnLZdjxGjOxS8IKXmNEBESAxPS8ShptS7b Ugvj9GvdxrbC1y/0HJ41njHcUTsncIm3xNm/6w/pTWpJXDRRoThrxAbyoT9izOcLJBf7upV/e9hgl m0JhpwjRqrs3n49cQWZwzYd7KlWuF2ncyzoskrmEMrmA9voPb8N9qD3QKqgfP3KZk8IJOj96XaQG/ fQa+33rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tvZJ1-0000000ETtE-2YKl; Fri, 21 Mar 2025 10:08:47 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tvYn1-0000000ENmb-1pfx; Fri, 21 Mar 2025 09:35:45 +0000 X-UUID: d9256e90063711f0a1e849db4cc18d44-20250321 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=8fPIEbSr/x96UkwYOjiufP/9onrTKMsAghpNqi9YKjk=; b=JltSFHdwSQx9t/oxtwQ9QAniYYSS6mV+4tR/6MQDJ0Rw2ihbxifNO6fbC89qTnevcJfmuFd9+EybHFiyi9Xet9BzMjALBUi+C1Oh0D1ZRccRiO3SvRzvrquYl8N4f+ytw0WIBh+w0YSsy6jVF9y1teBbBCAfcC6O6iM8lyGixE8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.2.1,REQID:49cf0f95-f211-43de-b32b-2f18d4f3bb2f,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:0ef645f,CLOUDID:727ba1c6-16da-468a-87f7-8ca8d6b3b9f7,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|50,EDM:-3 ,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV :0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: d9256e90063711f0a1e849db4cc18d44-20250321 Received: from mtkmbs09n2.mediatek.inc [(172.21.101.94)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1272785313; Fri, 21 Mar 2025 02:35:38 -0700 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Fri, 21 Mar 2025 17:35:37 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Fri, 21 Mar 2025 17:35:37 +0800 From: paul-pl.chen To: , , , , Subject: [PATCH v2 11/15] drm/mediatek: add BLENDER support for MT8196 Date: Fri, 21 Mar 2025 17:33:40 +0800 Message-ID: <20250321093435.94835-12-paul-pl.chen@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321093435.94835-1-paul-pl.chen@mediatek.com> References: <20250321093435.94835-1-paul-pl.chen@mediatek.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250321_023543_490520_78B1B76B X-CRM114-Status: GOOD ( 24.98 ) 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: , Cc: devicetree@vger.kernel.org, xiandong.wang@mediatek.com, jason-jh.lin@mediatek.com, singo.chang@mediatek.com, treapking@chromium.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Project_Global_Chrome_Upstream_Group@mediatek.com, paul-pl.chen@mediatek.com, nancy.lin@mediatek.com, linux-mediatek@lists.infradead.org, sunny.shen@mediatek.com, p.zabel@pengutronix.de, sirius.wang@mediatek.com, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Nancy Lin BLENDER executes the alpha blending function for overlapping layers from different sources, which is the primary function of the overlapping system. Signed-off-by: Nancy Lin Signed-off-by: Paul-pl Chen --- drivers/gpu/drm/mediatek/Makefile | 1 + drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 1 + drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_disp_blender.c | 276 ++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_disp_blender.h | 18 ++ drivers/gpu/drm/mediatek/mtk_disp_drv.h | 12 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 8 files changed, 311 insertions(+) create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_blender.c create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_blender.h diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile index db92f4fb353d..a7b9ebe27f68 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -3,6 +3,7 @@ mediatek-drm-y := mtk_crtc.o \ mtk_ddp_comp.o \ mtk_disp_aal.o \ + mtk_disp_blender.o \ mtk_disp_ccorr.o \ mtk_disp_color.o \ mtk_disp_exdma.o \ diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c index 3e0739d8e6f1..e65c6df987f2 100644 --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c @@ -445,6 +445,7 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DP_INTF] = "dp-intf", [MTK_DPI] = "dpi", [MTK_DSI] = "dsi", + [MTK_OVL_BLENDER] = "blender", [MTK_OVL_EXDMA] = "exdma", }; diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h index 86dc0ee3924c..075ba5683f93 100644 --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h @@ -43,6 +43,7 @@ enum mtk_ddp_comp_type { MTK_DPI, MTK_DP_INTF, MTK_DSI, + MTK_OVL_BLENDER, MTK_OVL_EXDMA, MTK_DDP_COMP_TYPE_MAX, }; diff --git a/drivers/gpu/drm/mediatek/mtk_disp_blender.c b/drivers/gpu/drm/mediatek/mtk_disp_blender.c new file mode 100644 index 000000000000..32c9e3d463a4 --- /dev/null +++ b/drivers/gpu/drm/mediatek/mtk_disp_blender.c @@ -0,0 +1,276 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2025 MediaTek Inc. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mtk_crtc.h" +#include "mtk_ddp_comp.h" +#include "mtk_disp_drv.h" +#include "mtk_drm_drv.h" +#include "mtk_disp_blender.h" +#include "mtk_disp_ovl.h" + +#define OVL_BLD_ALPHA 0xff +#define DISP_REG_OVL_BLD_DATAPATH_CON 0x010 +#define OVL_BLD_BGCLR_IN_SEL BIT(0) +#define OVL_BLD_BGCLR_OUT_TO_PROC BIT(4) +#define OVL_BLD_BGCLR_OUT_TO_NEXT_LAYER BIT(5) + +#define DISP_REG_OVL_BLD_EN 0x020 +#define OVL_BLD_EN BIT(0) +#define OVL_BLD_FORCE_RELAY_MODE BIT(4) +#define OVL_BLD_RELAY_MODE BIT(5) +#define DISP_REG_OVL_BLD_RST 0x024 +#define OVL_BLD_RST BIT(0) +#define DISP_REG_OVL_BLD_SHADOW_CTRL 0x028 +#define OVL_BLD_BYPASS_SHADOW BIT(2) +#define DISP_REG_OVL_BLD_BGCLR_BALCK 0xff000000 +#define DISP_REG_OVL_BLD_ROI_SIZE 0x030 +#define DISP_REG_OVL_BLD_L_EN 0x040 +#define OVL_BLD_L_EN BIT(0) +#define DISP_REG_OVL_BLD_OFFSET 0x044 +#define DISP_REG_OVL_BLD_SRC_SIZE 0x048 +#define DISP_REG_OVL_BLD_L0_CLRFMT 0x050 +#define OVL_BLD_CON_FLD_CLRFMT GENMASK(3, 0) +#define OVL_BLD_CON_CLRFMT_MAN BIT(4) +#define OVL_BLD_CON_FLD_CLRFMT_NB GENMASK(9, 8) +#define OVL_BLD_CON_CLRFMT_NB_10_BIT BIT(8) +#define OVL_BLD_CON_BYTE_SWAP BIT(16) +#define OVL_BLD_CON_RGB_SWAP BIT(17) +#define DISP_REG_OVL_BLD_BGCLR_CLR 0x104 +#define DISP_REG_OVL_BLD_L_CON2 0x200 +#define OVL_BLD_L_ALPHA GENMASK(7, 0) +#define OVL_BLD_L_ALPHA_EN BIT(12) +#define DISP_REG_OVL_BLD_L0_PITCH 0x208 +#define OVL_BLD_L0_CONST BIT(24) +#define DISP_REG_OVL_BLD_L0_CLR 0x20c +#define OVL_BLD_CON_CLRFMT_MAN BIT(4) +#define OVL_BLD_L0_SRC_PITCH GENMASK(15, 0) +#define DISP_REG_OVL_BLD_PITCH 0x2f4 + +struct mtk_disp_blender { + void __iomem *regs; + struct clk *clk; + struct cmdq_client_reg cmdq_reg; +}; + +void mtk_disp_blender_layer_config(struct device *dev, struct mtk_plane_state *state, + struct cmdq_pkt *cmdq_pkt) +{ + struct mtk_disp_blender *priv = dev_get_drvdata(dev); + struct mtk_plane_pending_state *pending = &state->pending; + unsigned int align_width = ALIGN_DOWN(pending->width, 2); + unsigned int alpha; + unsigned int clrfmt; + unsigned int blend_mode = mtk_ovl_get_blend_mode(state, + BIT(DRM_MODE_BLEND_PREMULTI) | + BIT(DRM_MODE_BLEND_COVERAGE) | + BIT(DRM_MODE_BLEND_PIXEL_NONE)); + unsigned int ignore_pixel_alpha = 0; + + if (!pending->enable) { + mtk_ddp_write(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, DISP_REG_OVL_BLD_L_EN); + return; + } + + mtk_ddp_write(cmdq_pkt, pending->y << 16 | pending->x, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_OFFSET); + + mtk_ddp_write(cmdq_pkt, pending->height << 16 | align_width, &priv->cmdq_reg, + priv->regs, DISP_REG_OVL_BLD_SRC_SIZE); + + clrfmt = mtk_ovl_fmt_convert(pending->format, blend_mode, true, false, 0, + OVL_BLD_CON_CLRFMT_MAN, OVL_BLD_CON_BYTE_SWAP, + OVL_BLD_CON_RGB_SWAP); + clrfmt |= mtk_ovl_is_10bit_rgb(pending->format) ? OVL_BLD_CON_CLRFMT_NB_10_BIT : 0; + mtk_ddp_write_mask(cmdq_pkt, clrfmt, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_L0_CLRFMT, OVL_BLD_CON_CLRFMT_MAN | + OVL_BLD_CON_RGB_SWAP | OVL_BLD_CON_BYTE_SWAP | + OVL_BLD_CON_FLD_CLRFMT | OVL_BLD_CON_FLD_CLRFMT_NB); + + alpha = (OVL_BLD_ALPHA & (state->base.alpha >> 8)) | + OVL_BLD_L_ALPHA_EN; + + if (mtk_ovl_is_ignore_pixel_alpha(state, blend_mode)) + ignore_pixel_alpha = OVL_BLD_L0_CONST; + + mtk_ddp_write_mask(cmdq_pkt, pending->pitch | ignore_pixel_alpha, + &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_PITCH, OVL_BLD_L0_CONST | OVL_BLD_L0_SRC_PITCH); + + mtk_ddp_write_mask(cmdq_pkt, alpha, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_L_CON2, OVL_BLD_L_ALPHA_EN | OVL_BLD_L_ALPHA); + + mtk_ddp_write(cmdq_pkt, OVL_BLD_L_EN, &priv->cmdq_reg, priv->regs, DISP_REG_OVL_BLD_L_EN); +} + +void mtk_disp_blender_config(struct device *dev, unsigned int w, + unsigned int h, unsigned int vrefresh, + unsigned int bpc, bool most_top, + bool most_bottom, struct cmdq_pkt *cmdq_pkt) +{ + struct mtk_disp_blender *priv = dev_get_drvdata(dev); + u32 datapath; + + dev_dbg(dev, "%s-w:%d, h:%d\n", __func__, w, h); + mtk_ddp_write(cmdq_pkt, h << 16 | w, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_ROI_SIZE); + mtk_ddp_write(cmdq_pkt, DISP_REG_OVL_BLD_BGCLR_BALCK, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_BGCLR_CLR); + mtk_ddp_write(cmdq_pkt, DISP_REG_OVL_BLD_BGCLR_BALCK, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_L0_CLR); + + if (most_top) + datapath = OVL_BLD_BGCLR_OUT_TO_PROC; + else + datapath = OVL_BLD_BGCLR_OUT_TO_NEXT_LAYER; + /* + * The primary input is from EXDMA and the second input + * is optionally from another blender + */ + if (!most_bottom) + datapath |= OVL_BLD_BGCLR_IN_SEL; + + mtk_ddp_write_mask(cmdq_pkt, datapath, + &priv->cmdq_reg, priv->regs, DISP_REG_OVL_BLD_DATAPATH_CON, + OVL_BLD_BGCLR_OUT_TO_PROC | OVL_BLD_BGCLR_OUT_TO_NEXT_LAYER | + OVL_BLD_BGCLR_IN_SEL); +} + +void mtk_disp_blender_start(struct device *dev, struct cmdq_pkt *cmdq_pkt) +{ + struct mtk_disp_blender *priv = dev_get_drvdata(dev); + unsigned int tmp; + + tmp = readl(priv->regs + DISP_REG_OVL_BLD_SHADOW_CTRL); + tmp = tmp | OVL_BLD_BYPASS_SHADOW; + writel(tmp, priv->regs + DISP_REG_OVL_BLD_SHADOW_CTRL); + mtk_ddp_write_mask(cmdq_pkt, OVL_BLD_EN, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_EN, OVL_BLD_EN); +} + +void mtk_disp_blender_stop(struct device *dev, struct cmdq_pkt *cmdq_pkt) +{ + struct mtk_disp_blender *priv = dev_get_drvdata(dev); + + mtk_ddp_write(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, DISP_REG_OVL_BLD_L_EN); + mtk_ddp_write_mask(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_EN, OVL_BLD_EN); + mtk_ddp_write_mask(cmdq_pkt, OVL_BLD_RST, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_RST, OVL_BLD_RST); + mtk_ddp_write_mask(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, + DISP_REG_OVL_BLD_RST, OVL_BLD_RST); +} + +int mtk_disp_blender_clk_enable(struct device *dev) +{ + struct mtk_disp_blender *priv = dev_get_drvdata(dev); + + return clk_prepare_enable(priv->clk); +} + +void mtk_disp_blender_clk_disable(struct device *dev) +{ + struct mtk_disp_blender *priv = dev_get_drvdata(dev); + + clk_disable_unprepare(priv->clk); +} + +u32 mtk_disp_blender_get_blend_modes(struct device *dev) +{ + return BIT(DRM_MODE_BLEND_PREMULTI) | + BIT(DRM_MODE_BLEND_COVERAGE) | + BIT(DRM_MODE_BLEND_PIXEL_NONE); +} + +static int mtk_disp_blender_bind(struct device *dev, struct device *master, + void *data) +{ + return 0; +} + +static void mtk_disp_blender_unbind(struct device *dev, struct device *master, void *data) +{ +} + +static const struct component_ops mtk_disp_blender_component_ops = { + .bind = mtk_disp_blender_bind, + .unbind = mtk_disp_blender_unbind, +}; + +static int mtk_disp_blender_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct resource *res; + struct mtk_disp_blender *priv; + int ret = 0; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + 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 blender\n"); + return PTR_ERR(priv->regs); + } + + priv->clk = devm_clk_get(dev, NULL); + if (IS_ERR(priv->clk)) { + dev_err(dev, "failed to get blender clk\n"); + return PTR_ERR(priv->clk); + } + +#if IS_REACHABLE(CONFIG_MTK_CMDQ) + ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); + if (ret) + dev_dbg(dev, "No mediatek,gce-client-reg\n"); +#endif + platform_set_drvdata(pdev, priv); + + ret = component_add(dev, &mtk_disp_blender_component_ops); + if (ret) + dev_notice(dev, "Failed to add component: %d\n", ret); + + return ret; +} + +static void mtk_disp_blender_remove(struct platform_device *pdev) +{ + component_del(&pdev->dev, &mtk_disp_blender_component_ops); +} + +static const struct of_device_id mtk_disp_blender_driver_dt_match[] = { + { .compatible = "mediatek,mt8196-blender"}, + {}, +}; + +MODULE_DEVICE_TABLE(of, mtk_disp_blender_driver_dt_match); + +struct platform_driver mtk_disp_blender_driver = { + .probe = mtk_disp_blender_probe, + .remove = mtk_disp_blender_remove, + .driver = { + .name = "mediatek-disp-blender", + .owner = THIS_MODULE, + .of_match_table = mtk_disp_blender_driver_dt_match, + }, +}; + +MODULE_AUTHOR("Nancy Lin "); +MODULE_DESCRIPTION("MediaTek Blender Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/mediatek/mtk_disp_blender.h b/drivers/gpu/drm/mediatek/mtk_disp_blender.h new file mode 100644 index 000000000000..be60a0f8de40 --- /dev/null +++ b/drivers/gpu/drm/mediatek/mtk_disp_blender.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2025 MediaTek Inc. + */ + +#ifndef __MTK_DISP_BLENDER_H__ +#define __MTK_DISP_BLENDER_H__ + +enum mtk_disp_blender_layer { + FIRST_BLENDER, + LAST_BLENDER, + SINGLE_BLENDER, + OTHERS, + BLENDER_LAYER_MAX, +}; + +u32 mtk_disp_blender_get_blend_modes(struct device *dev); +#endif // __MTK_DISP_BLENDER_H__ diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h index 4e3d2510bef5..39e3af1e2b16 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h @@ -9,6 +9,7 @@ #include #include #include +#include "mtk_disp_blender.h" #include "mtk_mdp_rdma.h" #include "mtk_plane.h" @@ -39,6 +40,17 @@ void mtk_color_config(struct device *dev, unsigned int w, unsigned int bpc, struct cmdq_pkt *cmdq_pkt); void mtk_color_start(struct device *dev); +void mtk_disp_blender_start(struct device *dev, struct cmdq_pkt *cmdq_pkt); +void mtk_disp_blender_stop(struct device *dev, struct cmdq_pkt *cmdq_pkt); +int mtk_disp_blender_clk_enable(struct device *dev); +void mtk_disp_blender_clk_disable(struct device *dev); +void mtk_disp_blender_config(struct device *dev, unsigned int w, + unsigned int h, unsigned int vrefresh, + unsigned int bpc, bool most_top, bool most_bottom, + struct cmdq_pkt *cmdq_pkt); +void mtk_disp_blender_layer_config(struct device *dev, struct mtk_plane_state *state, + struct cmdq_pkt *cmdq_pkt); + int mtk_disp_exdma_clk_enable(struct device *dev); void mtk_disp_exdma_clk_disable(struct device *dev); void mtk_disp_exdma_start(struct device *dev, struct cmdq_pkt *cmdq_pkt); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index bb7306a942ff..7a14f45d5f97 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -1274,6 +1274,7 @@ static struct platform_driver mtk_drm_platform_driver = { static struct platform_driver * const mtk_drm_drivers[] = { &mtk_disp_aal_driver, + &mtk_disp_blender_driver, &mtk_disp_ccorr_driver, &mtk_disp_color_driver, &mtk_disp_exdma_driver, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h index 898a75898775..89178de1478f 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h @@ -70,6 +70,7 @@ struct mtk_drm_private { }; extern struct platform_driver mtk_disp_aal_driver; +extern struct platform_driver mtk_disp_blender_driver; extern struct platform_driver mtk_disp_ccorr_driver; extern struct platform_driver mtk_disp_color_driver; extern struct platform_driver mtk_disp_exdma_driver;