mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Shawn Sung <shawn.sung@mediatek.com>
To: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@collabora.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>,
	David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Bibby Hsieh <bibby.hsieh@mediatek.com>,
	CK Hu <ck.hu@mediatek.com>,
	"Nancy . Lin" <nancy.lin@mediatek.com>,
	Fei Shao <fshao@chromium.org>, Sean Paul <sean@poorly.run>,
	Jason Chen <jason-ch.chen@mediatek.corp-partner.google.com>,
	<dri-devel@lists.freedesktop.org>,
	<linux-mediatek@lists.infradead.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	Hsiao Chien Sung <shawn.sung@mediatek.com>
Subject: [PATCH v7 12/18] drm/mediatek: Support "Pre-multiplied" blending in Mixer
Date: Thu, 2 May 2024 18:38:42 +0800	[thread overview]
Message-ID: <20240502103848.5845-13-shawn.sung@mediatek.com> (raw)
In-Reply-To: <20240502103848.5845-1-shawn.sung@mediatek.com>

From: Hsiao Chien Sung <shawn.sung@mediatek.com>

Support "Pre-multiplied" alpha blending mode in Mixer.
Before this patch, only the coverage mode is supported.

Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_ethdr.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c
index 5283e0993ed65..4f043be21ee36 100644
--- a/drivers/gpu/drm/mediatek/mtk_ethdr.c
+++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c
@@ -5,6 +5,7 @@
 
 #include <drm/drm_fourcc.h>
 #include <drm/drm_framebuffer.h>
+#include <drm/drm_blend.h>
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/of.h>
@@ -35,6 +36,7 @@
 #define MIX_SRC_L0_EN				BIT(0)
 #define MIX_L_SRC_CON(n)		(0x28 + 0x18 * (n))
 #define NON_PREMULTI_SOURCE			(2 << 12)
+#define PREMULTI_SOURCE				(3 << 12)
 #define MIX_L_SRC_SIZE(n)		(0x30 + 0x18 * (n))
 #define MIX_L_SRC_OFFSET(n)		(0x34 + 0x18 * (n))
 #define MIX_FUNC_DCM0			0x120
@@ -153,7 +155,7 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx,
 	struct mtk_plane_pending_state *pending = &state->pending;
 	unsigned int offset = (pending->x & 1) << 31 | pending->y << 16 | pending->x;
 	unsigned int align_width = ALIGN_DOWN(pending->width, 2);
-	unsigned int alpha_con = 0;
+	unsigned int mix_con = 0;
 	bool replace_src_a = false;
 
 	dev_dbg(dev, "%s+ idx:%d", __func__, idx);
@@ -171,8 +173,12 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx,
 		return;
 	}
 
-	if (state->base.fb && state->base.fb->format->has_alpha)
-		alpha_con = MIXER_ALPHA_AEN | MIXER_ALPHA;
+	mix_con |= MIXER_ALPHA_AEN | (state->base.alpha & MIXER_ALPHA);
+
+	if (state->base.pixel_blend_mode != DRM_MODE_BLEND_COVERAGE)
+		mix_con |= PREMULTI_SOURCE;
+	else
+		mix_con |= NON_PREMULTI_SOURCE;
 
 	if (state->base.fb && !state->base.fb->format->has_alpha) {
 		/*
@@ -189,8 +195,7 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx,
 	mtk_ddp_write(cmdq_pkt, pending->height << 16 | align_width, &mixer->cmdq_base,
 		      mixer->regs, MIX_L_SRC_SIZE(idx));
 	mtk_ddp_write(cmdq_pkt, offset, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_OFFSET(idx));
-	mtk_ddp_write_mask(cmdq_pkt, alpha_con, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_CON(idx),
-			   0x1ff);
+	mtk_ddp_write(cmdq_pkt, mix_con, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_CON(idx));
 	mtk_ddp_write_mask(cmdq_pkt, BIT(idx), &mixer->cmdq_base, mixer->regs, MIX_SRC_CON,
 			   BIT(idx));
 }
-- 
2.18.0


  parent reply	other threads:[~2024-05-02 10:39 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-02 10:38 [PATCH v7 00/18] Support IGT in display driver Shawn Sung
2024-05-02 10:38 ` [PATCH v7 01/18] soc: mediatek: Disable 9-bit alpha in ETHDR Shawn Sung
2024-05-07  5:58   ` CK Hu (胡俊光)
2024-05-07 10:02     ` Shawn Sung (宋孝謙)
2024-05-02 10:38 ` [PATCH v7 02/18] drm/mediatek: Add OVL compatible name for MT8195 Shawn Sung
2024-05-02 10:38 ` [PATCH v7 03/18] drm/mediatek: Add missing plane settings when async update Shawn Sung
2024-05-02 10:38 ` [PATCH v7 04/18] drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property Shawn Sung
2024-05-02 10:38 ` [PATCH v7 05/18] drm/mediatek: Set DRM mode configs accordingly Shawn Sung
2024-05-03  2:38   ` CK Hu (胡俊光)
2024-05-27  4:33   ` Fei Shao
2024-05-27  4:38     ` Chen-Yu Tsai
2024-05-27  4:54       ` Fei Shao
2024-05-27  5:28         ` Chen-Yu Tsai
2024-05-02 10:38 ` [PATCH v7 06/18] drm/mediatek: Turn off the layers with zero width or height Shawn Sung
2024-05-02 10:38 ` [PATCH v7 07/18] drm/mediatek: Support more 10bit formats in OVL Shawn Sung
2024-05-03  2:51   ` CK Hu (胡俊光)
2024-05-02 10:38 ` [PATCH v7 08/18] drm/mediatek: Support RGBA8888 and RGBX8888 " Shawn Sung
2024-05-03  2:58   ` CK Hu (胡俊光)
2024-05-02 10:38 ` [PATCH v7 09/18] drm/mediatek: Support constant blending " Shawn Sung
2024-05-03  5:29   ` CK Hu (胡俊光)
2024-05-03  5:52   ` CK Hu (胡俊光)
2024-05-02 10:38 ` [PATCH v7 10/18] drm/mediatek: Support constant blending in Mixer Shawn Sung
2024-05-03  5:45   ` CK Hu (胡俊光)
2024-05-02 10:38 ` [PATCH v7 11/18] drm/mediatek: Support "Pre-multiplied" blending in OVL Shawn Sung
2024-05-03  9:04   ` CK Hu (胡俊光)
2024-05-02 10:38 ` Shawn Sung [this message]
2024-05-03  9:28   ` [PATCH v7 12/18] drm/mediatek: Support "Pre-multiplied" blending in Mixer CK Hu (胡俊光)
2024-05-02 10:38 ` [PATCH v7 13/18] drm/mediatek: Support "None" blending in OVL Shawn Sung
2024-05-02 10:38 ` [PATCH v7 14/18] drm/mediatek: Support "None" blending in Mixer Shawn Sung
2024-05-03  9:40   ` CK Hu (胡俊光)
2024-05-02 10:38 ` [PATCH v7 15/18] drm/mediatek: Support alpha blending in display driver Shawn Sung
2024-05-02 10:38 ` [PATCH v7 16/18] drm/mediatek: Support CRC " Shawn Sung
2024-05-04 14:22   ` kernel test robot
2024-05-02 10:38 ` [PATCH v7 17/18] drm/mediatek: Support CRC in OVL Shawn Sung
2024-05-02 10:38 ` [PATCH v7 18/18] drm/mediatek: Support CRC in OVL adaptor Shawn Sung

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240502103848.5845-13-shawn.sung@mediatek.com \
    --to=shawn.sung@mediatek.com \
    --cc=airlied@gmail.com \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=bibby.hsieh@mediatek.com \
    --cc=chunkuang.hu@kernel.org \
    --cc=ck.hu@mediatek.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=fshao@chromium.org \
    --cc=jason-ch.chen@mediatek.corp-partner.google.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=nancy.lin@mediatek.com \
    --cc=p.zabel@pengutronix.de \
    --cc=sean@poorly.run \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®