From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06F18CA0EED for ; Thu, 28 Aug 2025 08:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: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:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=91unXKrGbTDeKulmVuy2IpfFgxjMO7TgUgeAB/op83w=; b=jt49hPWP0mmKiZUCHQOuuyS6BT UsvqzZLaNDacm3ny/EuHzDxjNan6Ts9uMROqZKwCqMluz9qWX9zmRvtt9Iuw09NRv8eKCDIDhDfo3 saw1mrLESZkcfRIuaDEWfS2tYfusCWtx4/6mdN7gIRWiiK5BzLCvLyK4rNdAAvszaatJyN8XaGjxA ldW769ETz02ZiRSEbDxtnmGKAqTgLK4uuk30Lk9JIram7QYNw0f9mKnrtlIFsp4N1BW17mlDz8f8b yCbaYreUhk8R0xUFP5hI52MTaVW4stresGq+vT/ZgqDF48oFwSgNUCnLx10o2Ko9sAb99Bdl41281 /B1cr7Xg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1urYNg-00000000rtK-1PnT; Thu, 28 Aug 2025 08:53:16 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1urXh5-00000000jSa-0vM7; Thu, 28 Aug 2025 08:09:17 +0000 X-UUID: 45f97a5883e611f09eb0dd999d3936bf-20250828 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=91unXKrGbTDeKulmVuy2IpfFgxjMO7TgUgeAB/op83w=; b=oNq5VIK73QozqL1gB+UyH1oF6am1nUwWDvyrQRhIYaK/bSl+vWg+UWYGmuqim9t9iPfC5OCYy0kBXzSLVJf0myh2Yb1dIrYG3Jw59NC9IIFAWhhFBsIVZAVCg2ZyN/x0mSe9/6PmRVSYhHwFaNmbUnDbWXjQmPJeMs1yit0zlXI=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.3,REQID:9403b31c-db5e-4b9e-854d-7258bcbaf66d,IP:0,UR L:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:-5 X-CID-META: VersionHash:f1326cf,CLOUDID:5b1bf544-18c5-4075-a135-4c0afe29f9d6,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:-5,Content:0|15|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: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 45f97a5883e611f09eb0dd999d3936bf-20250828 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1275978356; Thu, 28 Aug 2025 01:09:08 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Thu, 28 Aug 2025 16:09:05 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Thu, 28 Aug 2025 16:09:05 +0800 From: Paul Chen To: , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v4 13/19] drm/mediatek: Export OVL Blend function Date: Thu, 28 Aug 2025 16:07:08 +0800 Message-ID: <20250828080855.3502514-14-paul-pl.chen@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250828080855.3502514-1-paul-pl.chen@mediatek.com> References: <20250828080855.3502514-1-paul-pl.chen@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250828_010915_304690_8A320588 X-CRM114-Status: GOOD ( 19.83 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Paul-pl Chen For the new BLENDER component, the OVL ignore pixel alpha logic should be exported as a function and reused it. Signed-off-by: Nancy Lin Signed-off-by: Paul-pl Chen --- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 68 +++++++++++++++++-------- drivers/gpu/drm/mediatek/mtk_disp_ovl.h | 8 +++ 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c index e3ee3f60f4ba..7cd3978beb98 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -228,6 +228,23 @@ void mtk_ovl_disable_vblank(struct device *dev) writel_relaxed(0x0, ovl->regs + DISP_REG_OVL_INTEN); } +bool mtk_ovl_is_ignore_pixel_alpha(struct mtk_plane_state *state, unsigned int blend_mode) +{ + if (!state->base.fb) + return false; + + /* + * Although the alpha channel can be ignored, CONST_BLD must be enabled + * for XRGB format, otherwise OVL will still read the value from memory. + * For RGB888 related formats, whether CONST_BLD is enabled or not won't + * affect the result. Therefore we use !has_alpha as the condition. + */ + if (blend_mode == DRM_MODE_BLEND_PIXEL_NONE || !state->base.fb->format->has_alpha) + return true; + + return false; +} + u32 mtk_ovl_get_blend_modes(struct device *dev) { struct mtk_disp_ovl *ovl = dev_get_drvdata(dev); @@ -414,6 +431,29 @@ void mtk_ovl_layer_off(struct device *dev, unsigned int idx, DISP_REG_OVL_RDMA_CTRL(idx)); } +unsigned int mtk_ovl_get_blend_mode(struct mtk_plane_state *state, unsigned int blend_modes) +{ + unsigned int blend_mode = DRM_MODE_BLEND_COVERAGE; + + /* + * For the platforms where OVL_CON_CLRFMT_MAN is defined in the hardware data sheet + * and supports premultiplied color formats, such as OVL_CON_CLRFMT_PARGB888 + * and supports premultiplied color formats, such as OVL_CON_CLRFMT_PARGB8888. + * + * Check blend_modes in the driver data to see if premultiplied mode is supported. + * If not, use coverage mode instead to set it to the supported color formats. + * + * Current DRM assumption is that alpha is default premultiplied, so the bitmask of + * blend_modes must include BIT(DRM_MODE_BLEND_PREMULTI). Otherwise, mtk_plane_init() + * will get an error return from drm_plane_create_blend_mode_property() and + * state->base.pixel_blend_mode should not be used. + */ + if (blend_modes & BIT(DRM_MODE_BLEND_PREMULTI)) + blend_mode = state->base.pixel_blend_mode; + + return blend_mode; +} + unsigned int mtk_ovl_fmt_convert(unsigned int fmt, unsigned int blend_mode, bool fmt_rgb565_is_0, bool color_convert, u8 clrfmt_shift, u32 clrfmt_man, u32 byte_swap, u32 rgb_swap) @@ -541,7 +581,7 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx, unsigned int rotation = pending->rotation; unsigned int offset = (pending->y << 16) | pending->x; unsigned int src_size = (pending->height << 16) | pending->width; - unsigned int blend_mode = state->base.pixel_blend_mode; + unsigned int blend_mode = mtk_ovl_get_blend_mode(state, ovl->data->blend_modes); unsigned int ignore_pixel_alpha = 0; unsigned int con; @@ -566,17 +606,8 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx, * For blend_modes supported SoCs, always enable alpha blending. * For blend_modes unsupported SoCs, enable alpha blending when has_alpha is set. */ - if (blend_mode || state->base.fb->format->has_alpha) + if (state->base.pixel_blend_mode || state->base.fb->format->has_alpha) con |= OVL_CON_AEN; - - /* - * Although the alpha channel can be ignored, CONST_BLD must be enabled - * for XRGB format, otherwise OVL will still read the value from memory. - * For RGB888 related formats, whether CONST_BLD is enabled or not won't - * affect the result. Therefore we use !has_alpha as the condition. - */ - if (blend_mode == DRM_MODE_BLEND_PIXEL_NONE || !state->base.fb->format->has_alpha) - ignore_pixel_alpha = OVL_CONST_BLEND; } /* @@ -602,6 +633,9 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx, mtk_ddp_write_relaxed(cmdq_pkt, con, &ovl->cmdq_reg, ovl->regs, DISP_REG_OVL_CON(idx)); + + if (mtk_ovl_is_ignore_pixel_alpha(state, blend_mode)) + ignore_pixel_alpha = OVL_CONST_BLEND; mtk_ddp_write_relaxed(cmdq_pkt, pitch_lsb | ignore_pixel_alpha, &ovl->cmdq_reg, ovl->regs, DISP_REG_OVL_PITCH(idx)); mtk_ddp_write_relaxed(cmdq_pkt, src_size, &ovl->cmdq_reg, ovl->regs, @@ -751,9 +785,7 @@ static const struct mtk_disp_ovl_data mt8192_ovl_driver_data = { .layer_nr = 4, .fmt_rgb565_is_0 = true, .smi_id_en = true, - .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) | - BIT(DRM_MODE_BLEND_COVERAGE) | - BIT(DRM_MODE_BLEND_PIXEL_NONE), + .blend_modes = MTK_OVL_SUPPORT_BLEND_MODES, .formats = mt8173_ovl_formats, .num_formats = mt8173_ovl_formats_len, }; @@ -764,9 +796,7 @@ static const struct mtk_disp_ovl_data mt8192_ovl_2l_driver_data = { .layer_nr = 2, .fmt_rgb565_is_0 = true, .smi_id_en = true, - .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) | - BIT(DRM_MODE_BLEND_COVERAGE) | - BIT(DRM_MODE_BLEND_PIXEL_NONE), + .blend_modes = MTK_OVL_SUPPORT_BLEND_MODES, .formats = mt8173_ovl_formats, .num_formats = mt8173_ovl_formats_len, }; @@ -778,9 +808,7 @@ static const struct mtk_disp_ovl_data mt8195_ovl_driver_data = { .fmt_rgb565_is_0 = true, .smi_id_en = true, .supports_afbc = true, - .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) | - BIT(DRM_MODE_BLEND_COVERAGE) | - BIT(DRM_MODE_BLEND_PIXEL_NONE), + .blend_modes = MTK_OVL_SUPPORT_BLEND_MODES, .formats = mt8195_ovl_formats, .num_formats = mt8195_ovl_formats_len, .supports_clrfmt_ext = true, diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.h b/drivers/gpu/drm/mediatek/mtk_disp_ovl.h index 4f446d2e0712..431567538eb5 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.h +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.h @@ -6,14 +6,22 @@ #ifndef __MTK_DISP_OVL_H__ #define __MTK_DISP_OVL_H__ +#include #include +#define MTK_OVL_SUPPORT_BLEND_MODES \ + (BIT(DRM_MODE_BLEND_PREMULTI) | \ + BIT(DRM_MODE_BLEND_COVERAGE) | \ + BIT(DRM_MODE_BLEND_PIXEL_NONE)) + extern const u32 mt8173_ovl_formats[]; extern const size_t mt8173_ovl_formats_len; extern const u32 mt8195_ovl_formats[]; extern const size_t mt8195_ovl_formats_len; bool mtk_ovl_is_10bit_rgb(unsigned int fmt); +bool mtk_ovl_is_ignore_pixel_alpha(struct mtk_plane_state *state, unsigned int blend_mode); +unsigned int mtk_ovl_get_blend_mode(struct mtk_plane_state *state, unsigned int blend_modes); unsigned int mtk_ovl_fmt_convert(unsigned int fmt, unsigned int blend_mode, bool fmt_rgb565_is_0, bool color_convert, u8 clrfmt_shift, u32 clrfmt_man, u32 byte_swap, u32 rgb_swap); -- 2.45.2