From: Hsiao Chien Sung <shawn.sung@mediatek.com>
To: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Jassi Brar <jassisinghbrar@gmail.com>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Singo Chang <singo.chang@mediatek.com>,
Nancy Lin <nancy.lin@mediatek.com>,
Jason-JH Lin <jason-jh.lin@mediatek.com>,
Hsiao Chien Sung <shawn.sung@mediatek.com>
Subject: [PATCH 07/15] drm/mediatek: Support alpha blending in VDOSYS1
Date: Wed, 23 Aug 2023 23:13:24 +0800 [thread overview]
Message-ID: <20230823151332.28811-8-shawn.sung@mediatek.com> (raw)
In-Reply-To: <20230823151332.28811-1-shawn.sung@mediatek.com>
Support premultiply and coverage alpha blending modes.
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_ethdr.c | 50 +++++++++++++++++++++-------
1 file changed, 38 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c
index 73dc4da3ba3b..3058c122a4c3 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_device.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
@@ -50,9 +52,7 @@
#define MIXER_INX_MODE_BYPASS 0
#define MIXER_INX_MODE_EVEN_EXTEND 1
-#define DEFAULT_9BIT_ALPHA 0x100
#define MIXER_ALPHA_AEN BIT(8)
-#define MIXER_ALPHA 0xff
#define ETHDR_CLK_NUM 13
enum mtk_ethdr_comp_id {
@@ -153,33 +153,59 @@ 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 = NON_PREMULTI_SOURCE;
+ bool replace_src_a = false;
+
+ union format {
+ unsigned int raw;
+ char str[5];
+ } format;
dev_dbg(dev, "%s+ idx:%d", __func__, idx);
if (idx >= 4)
return;
- if (!pending->enable) {
+ if (!pending->enable || !pending->width || !pending->height) {
+ /*
+ * instead of disabling layer with MIX_SRC_CON directly
+ * set the size to 0 to avoid screen shift due to mode switch
+ */
mtk_ddp_write(cmdq_pkt, 0, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_SIZE(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 & 0xff);
+
+ if (state->base.pixel_blend_mode != DRM_MODE_BLEND_COVERAGE)
+ mix_con |= PREMULTI_SOURCE;
+
+ if (state->base.pixel_blend_mode == DRM_MODE_BLEND_PIXEL_NONE ||
+ (state->base.fb && !state->base.fb->format->has_alpha)) {
+ /*
+ * Mixer doesn't support CONST_BLD mode,
+ * use a trick to make the output equivalent
+ */
+ replace_src_a = true;
+ }
+
+ format.raw = pending->format;
+
+ dev_dbg(dev, "L%d: %ux%u(%u,%u)%s: SCA=0x%x(%u), MIX=0x%x\n", idx,
+ pending->width, pending->height, pending->x, pending->y,
+ format.str, (state->base.alpha & 0xff), state->base.pixel_blend_mode,
+ mix_con);
- mtk_mmsys_mixer_in_config(priv->mmsys_dev, idx + 1, alpha_con ? false : true,
- DEFAULT_9BIT_ALPHA,
+ mtk_mmsys_mixer_in_config(priv->mmsys_dev, idx + 1, replace_src_a, 0xff,
pending->x & 1 ? MIXER_INX_MODE_EVEN_EXTEND :
MIXER_INX_MODE_BYPASS, align_width / 2 - 1, cmdq_pkt);
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_mask(cmdq_pkt, BIT(idx), &mixer->cmdq_base, mixer->regs, MIX_SRC_CON,
- BIT(idx));
+ 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));
}
void mtk_ethdr_config(struct device *dev, unsigned int w,
--
2.18.0
next prev parent reply other threads:[~2023-08-23 15:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 15:13 [PATCH 00/15] Support IGT in display driver Hsiao Chien Sung
2023-08-23 15:13 ` [PATCH 01/15] soc: mediatek: Add register definitions for GCE Hsiao Chien Sung
2023-09-07 12:11 ` AngeloGioacchino Del Regno
2023-09-11 13:38 ` Shawn Sung (宋孝謙)
2023-08-23 15:13 ` [PATCH 02/15] soc: mediatek: Disable 9-bit alpha in ETHDR Hsiao Chien Sung
2023-08-23 15:13 ` [PATCH 03/15] soc: mediatek: Support GCE thread loop Hsiao Chien Sung
2023-08-29 7:07 ` CK Hu (胡俊光)
2023-08-30 2:15 ` CK Hu (胡俊光)
2023-08-23 15:13 ` [PATCH 04/15] mailbox: mtk-cmdq: " Hsiao Chien Sung
2023-08-29 7:13 ` CK Hu (胡俊光)
2023-08-23 15:13 ` [PATCH 05/15] drm/mediatek: Support alpha blending in display driver Hsiao Chien Sung
2023-09-07 12:17 ` AngeloGioacchino Del Regno
2023-08-23 15:13 ` [PATCH 06/15] drm/mediatek: Support alpha blending in VDOSYS0 Hsiao Chien Sung
2023-09-07 12:10 ` AngeloGioacchino Del Regno
2023-08-23 15:13 ` Hsiao Chien Sung [this message]
2023-09-07 12:15 ` [PATCH 07/15] drm/mediatek: Support alpha blending in VDOSYS1 AngeloGioacchino Del Regno
2023-08-23 15:13 ` [PATCH 08/15] drm/mediatek: Move struct mtk_drm_crtc to the header file Hsiao Chien Sung
2023-08-23 15:13 ` [PATCH 09/15] drm/mediatek: Add OVL compatible name for MT8195 Hsiao Chien Sung
2023-08-23 15:13 ` [PATCH 10/15] drm/mediatek: Support CRC in display driver Hsiao Chien Sung
2023-09-07 12:20 ` AngeloGioacchino Del Regno
2023-08-23 15:13 ` [PATCH 11/15] drm/mediatek: Support CRC in VDOSYS0 Hsiao Chien Sung
2023-08-24 2:29 ` CK Hu (胡俊光)
2023-08-30 5:13 ` Shawn Sung (宋孝謙)
2023-08-31 1:45 ` CK Hu (胡俊光)
2023-08-23 15:13 ` [PATCH 12/15] drm/mediatek: Support CRC in VDOSYS1 Hsiao Chien Sung
2023-09-07 12:31 ` AngeloGioacchino Del Regno
2023-08-23 15:13 ` [PATCH 13/15] drm/mediatek: Add missing plane settings when async update Hsiao Chien Sung
2023-09-07 12:33 ` AngeloGioacchino Del Regno
2023-09-11 13:45 ` Shawn Sung (宋孝謙)
2023-09-14 13:18 ` AngeloGioacchino Del Regno
2023-09-18 8:58 ` Shawn Sung (宋孝謙)
2023-08-23 15:13 ` [PATCH 14/15] drm/mediatek: Adjust DRM mode configs for IGT Hsiao Chien Sung
2023-08-23 15:13 ` [PATCH 15/15] drm/mediatek: Fix errors when reporting rotation capability Hsiao Chien 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=20230823151332.28811-8-shawn.sung@mediatek.com \
--to=shawn.sung@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=airlied@gmail.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--cc=daniel@ffwll.ch \
--cc=jason-jh.lin@mediatek.com \
--cc=jassisinghbrar@gmail.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=singo.chang@mediatek.com \
/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