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 10/15] drm/mediatek: Support CRC in display driver
Date: Wed, 23 Aug 2023 23:13:27 +0800 [thread overview]
Message-ID: <20230823151332.28811-11-shawn.sung@mediatek.com> (raw)
In-Reply-To: <20230823151332.28811-1-shawn.sung@mediatek.com>
Register CRC related function pointers to support CRC
retrieval.
Skip the first CRC because when the first vblank triggered,
the frame buffer is not ready for CRC calculation yet.
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 53 +++++++++++++++++++++
drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 20 ++++++++
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 5 ++
3 files changed, 78 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index e8313739b54d..0fa713c550b1 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -573,6 +573,17 @@ static void mtk_crtc_ddp_irq(void *data)
struct drm_crtc *crtc = data;
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_drm_private *priv = crtc->dev->dev_private;
+ static int skip;
+
+ if (mtk_crtc->crc.cnt && crtc->crc.opened) {
+ if (++skip > 1) {
+ drm_crtc_add_crc_entry(crtc, true,
+ drm_crtc_vblank_count(crtc),
+ (u32 *)mtk_crtc->crc.va);
+ }
+ } else {
+ skip = 0;
+ }
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
if (!priv->data->shadow_register && !mtk_crtc->cmdq_client.chan)
@@ -605,6 +616,34 @@ static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
mtk_ddp_comp_disable_vblank(comp);
}
+static int mtk_drm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src)
+{
+ if (src && strcmp(src, "auto") != 0) {
+ DRM_DEBUG_DRIVER("%s(crtc-%d): unknown source '%s'\n",
+ __func__, drm_crtc_index(crtc), src);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int mtk_drm_crtc_verify_crc_source(struct drm_crtc *crtc,
+ const char *src,
+ size_t *cnt)
+{
+ struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
+
+ if (src && strcmp(src, "auto") != 0) {
+ DRM_DEBUG_DRIVER("%s(crtc-%d): unknown source '%s'\n",
+ __func__, drm_crtc_index(crtc), src);
+ return -EINVAL;
+ }
+
+ *cnt = (size_t)mtk_crtc->crc.cnt;
+
+ return 0;
+}
+
int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
struct mtk_plane_state *state)
{
@@ -737,6 +776,8 @@ static const struct drm_crtc_funcs mtk_crtc_funcs = {
.atomic_destroy_state = mtk_drm_crtc_destroy_state,
.enable_vblank = mtk_drm_crtc_enable_vblank,
.disable_vblank = mtk_drm_crtc_disable_vblank,
+ .set_crc_source = mtk_drm_crtc_set_crc_source,
+ .verify_crc_source = mtk_drm_crtc_verify_crc_source,
};
static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {
@@ -919,6 +960,18 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
if (comp->funcs->ctm_set)
has_ctm = true;
+
+ if (comp->funcs->crc_cnt) {
+ mtk_crtc->crc.cnt = comp->funcs->crc_cnt(comp->dev);
+ mtk_crtc->crc.va = dma_alloc_coherent(dev,
+ mtk_crtc->crc.cnt * 4,
+ &mtk_crtc->crc.pa,
+ GFP_KERNEL);
+ if (!mtk_crtc->crc.va || !mtk_crtc->crc.pa) {
+ dev_err(dev, "failed to allocate CRC\n");
+ return -ENOMEM;
+ }
+ }
}
mtk_ddp_comp_register_vblank_cb(comp, mtk_crtc_ddp_irq,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index 34cd1bfed8b3..8303464f494c 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -14,6 +14,23 @@
#define MTK_MAX_BPC 10
#define MTK_MIN_BPC 3
+/*
+ * struct mtk_drm_crc - CRC info of the CRTC
+ * @cnt: how many CRCs the CRTC supports
+ * @va: virtual address for CPU to read the CRCs
+ * @pa: physical address for GCE to stored the CRCs
+ *
+ * Hardware components could generate more than one CRC,
+ * for example, one for odd lines, another for even lines of the frame buffer,
+ * and each CRC takes 4 bytes in memory, here we record how many CRC the
+ * generator supports, and access them as an array from the specified address.
+ */
+struct mtk_drm_crc {
+ u32 cnt;
+ void *va;
+ dma_addr_t pa;
+};
+
/*
* struct mtk_drm_crtc - MediaTek specific crtc structure.
* @base: crtc object.
@@ -24,6 +41,7 @@
* @mutex: handle to one of the ten disp_mutex streams
* @ddp_comp_nr: number of components in ddp_comp
* @ddp_comp: array of pointers the mtk_ddp_comp structures used by this crtc
+ * @crc: CRC info of the CRTC
*
* TODO: Needs update: this header is missing a bunch of member descriptions.
*/
@@ -56,6 +74,8 @@ struct mtk_drm_crtc {
/* lock for display hardware access */
struct mutex hw_lock;
bool config_updating;
+
+ struct mtk_drm_crc crc;
};
void mtk_drm_crtc_commit(struct drm_crtc *crtc);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index febcaeef16a1..3b67c3dc0525 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -45,6 +45,10 @@ enum mtk_ddp_comp_type {
struct mtk_ddp_comp;
struct cmdq_pkt;
+
+/* struct mtk_ddp_comp_funcs - function pointers of the ddp components
+ * @crc_cnt: how many CRCs the component supports
+ */
struct mtk_ddp_comp_funcs {
int (*clk_enable)(struct device *dev);
void (*clk_disable)(struct device *dev);
@@ -80,6 +84,7 @@ struct mtk_ddp_comp_funcs {
void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
void (*add)(struct device *dev, struct mtk_mutex *mutex);
void (*remove)(struct device *dev, struct mtk_mutex *mutex);
+ u32 (*crc_cnt)(struct device *dev);
};
struct mtk_ddp_comp {
--
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 ` [PATCH 07/15] drm/mediatek: Support alpha blending in VDOSYS1 Hsiao Chien Sung
2023-09-07 12:15 ` 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 ` Hsiao Chien Sung [this message]
2023-09-07 12:20 ` [PATCH 10/15] drm/mediatek: Support CRC in display driver 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-11-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