From: Stu Hsieh <stu.hsieh@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>, Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>,
Matthias Brugger <matthias.bgg@gmail.com>,
<dri-devel@lists.freedesktop.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <srv_heupstream@mediatek.com>,
Stu Hsieh <stu.hsieh@mediatek.com>
Subject: [PATCH v3 07/13] drm/mediatek: add YUYV/UYVY color format support for RDMA
Date: Mon, 6 Aug 2018 19:58:14 +0800 [thread overview]
Message-ID: <1533556700-26525-8-git-send-email-stu.hsieh@mediatek.com> (raw)
In-Reply-To: <1533556700-26525-1-git-send-email-stu.hsieh@mediatek.com>
This patch add YUYV/UYVY color format support for RDMA
and transform matrix for YUYV/UYVY.
Signed-off-by: Stu Hsieh <stu.hsieh@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index ba72d392dc27..91a8b6e27d39 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -33,6 +33,8 @@
#define RDMA_ENGINE_EN BIT(0)
#define RDMA_MODE_MEMORY BIT(1)
#define DISP_REG_RDMA_SIZE_CON_0 0x0014
+#define RDMA_MATRIX_ENABLE BIT(17)
+#define RDMA_MATRIX_INT_MTX_SEL (7UL << 20)
#define DISP_REG_RDMA_SIZE_CON_1 0x0018
#define DISP_REG_RDMA_TARGET_LINE 0x001c
#define DISP_RDMA_MEM_CON 0x0024
@@ -46,12 +48,15 @@
#define RDMA_FIFO_SIZE(rdma) ((rdma)->data->fifo_size)
#define DISP_RDMA_MEM_START_ADDR 0x0f00
+#define MATRIX_INT_MTX_SEL_DEFAULT 0xb00000
#define RDMA_MEM_GMC 0x40402020
#define MEM_MODE_INPUT_FORMAT_RGB565 0x0
#define MEM_MODE_INPUT_FORMAT_RGB888 (0x001 << 4)
#define MEM_MODE_INPUT_FORMAT_RGBA8888 (0x002 << 4)
#define MEM_MODE_INPUT_FORMAT_ARGB8888 (0x003 << 4)
+#define MEM_MODE_INPUT_FORMAT_UYVY (0x004 << 4)
+#define MEM_MODE_INPUT_FORMAT_YUYV (0x005 << 4)
struct mtk_disp_rdma_data {
unsigned int fifo_size;
@@ -176,6 +181,10 @@ static unsigned int rdma_fmt_convert(struct mtk_disp_rdma *rdma,
case DRM_FORMAT_XBGR8888:
case DRM_FORMAT_ABGR8888:
return MEM_MODE_INPUT_FORMAT_RGBA8888 | MEM_MODE_INPUT_SWAP;
+ case DRM_FORMAT_UYVY:
+ return MEM_MODE_INPUT_FORMAT_UYVY;
+ case DRM_FORMAT_YUYV:
+ return MEM_MODE_INPUT_FORMAT_YUYV;
}
}
@@ -191,6 +200,12 @@ static void mtk_rdma_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
con = rdma_fmt_convert(rdma, fmt);
writel_relaxed(con, comp->regs + DISP_RDMA_MEM_CON);
+ if (fmt == DRM_FORMAT_UYVY || fmt == DRM_FORMAT_YUYV)
+ rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0, 0xff0000,
+ RDMA_MATRIX_ENABLE | RDMA_MATRIX_INT_MTX_SEL);
+ else
+ rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0, 0xff0000,
+ MATRIX_INT_MTX_SEL_DEFAULT);
writel_relaxed(addr, comp->regs + DISP_RDMA_MEM_START_ADDR);
writel_relaxed(pitch, comp->regs + DISP_RDMA_MEM_SRC_PITCH);
--
2.12.5.2.gbdf23ab
next prev parent reply other threads:[~2018-08-06 11:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 11:58 [PATCH v3 00/13] Add RDMA memory mode support for mediatek SOC MT2712 Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 01/13] drm/mediatek: add connection from RDMA0 to DPI1 Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 02/13] drm/mediatek: add connection from RDMA0 to DSI1 Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 03/13] drm/mediatek: add connection from RDMA1 to DSI0 Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 04/13] drm/mediatek: add connection from RDMA2 " Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 05/13] drm/mediatek: add memory mode and layer_config for RDMA Stu Hsieh
2018-08-07 2:37 ` CK Hu
2018-08-06 11:58 ` [PATCH v3 06/13] drm/mediatek: add RGB color format support " Stu Hsieh
2018-08-07 3:01 ` CK Hu
2018-08-07 9:50 ` Stu Hsieh
2018-08-06 11:58 ` Stu Hsieh [this message]
2018-08-07 3:33 ` [PATCH v3 07/13] drm/mediatek: add YUYV/UYVY " CK Hu
2018-08-07 9:49 ` Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 08/13] drm/mediatek: add function to get layer number for component Stu Hsieh
2018-08-07 3:37 ` CK Hu
2018-08-06 11:58 ` [PATCH v3 09/13] drm/mediatek: add callback function to return OVL layer number Stu Hsieh
2018-08-07 3:47 ` CK Hu
2018-08-06 11:58 ` [PATCH v3 10/13] drm/mediatek: add callback function to return RDMA " Stu Hsieh
2018-08-07 3:47 ` CK Hu
2018-08-06 11:58 ` [PATCH v3 11/13] drm/mediatek: use layer_nr function to get layer number to init plane Stu Hsieh
2018-08-07 4:32 ` CK Hu
2018-08-07 9:51 ` Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 12/13] drm/mediatek: update some variable name from ovl to comp Stu Hsieh
2018-08-06 11:58 ` [PATCH v3 13/13] drm/mediatek: fix connection from RDMA2 to DSI1 Stu Hsieh
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=1533556700-26525-8-git-send-email-stu.hsieh@mediatek.com \
--to=stu.hsieh@mediatek.com \
--cc=airlied@linux.ie \
--cc=ck.hu@mediatek.com \
--cc=dri-devel@lists.freedesktop.org \
--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=p.zabel@pengutronix.de \
--cc=srv_heupstream@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;
as well as URLs for NNTP newsgroup(s).