From: Bo-Chen Chen <rex-bc.chen@mediatek.com>
To: <chunkuang.hu@kernel.org>, <p.zabel@pengutronix.de>,
<daniel@ffwll.ch>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>, <matthias.bgg@gmail.com>,
<airlied@linux.ie>
Cc: <msp@baylibre.com>, <granquet@baylibre.com>,
<jitao.shi@mediatek.com>, <wenst@chromium.org>,
<angelogioacchino.delregno@collabora.com>, <ck.hu@mediatek.com>,
<dri-devel@lists.freedesktop.org>,
<linux-mediatek@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Bo-Chen Chen <rex-bc.chen@mediatek.com>
Subject: [PATCH v12 14/14] drm/mediatek: dpi: Add matrix_sel helper
Date: Mon, 20 Jun 2022 20:10:28 +0800 [thread overview]
Message-ID: <20220620121028.29234-15-rex-bc.chen@mediatek.com> (raw)
In-Reply-To: <20220620121028.29234-1-rex-bc.chen@mediatek.com>
From: Guillaume Ranquet <granquet@baylibre.com>
Matrix selection is a new feature for both dpi and dpintf of MT8195.
Add a mtk_dpi_matrix_sel() helper to update the DPI_MATRIX_SET
register depending on the color format.
Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
Signed-off-by: Bo-Chen Chen <rex-bc.chen@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_dpi.c | 29 +++++++++++++++++++++++++
drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 3 +++
2 files changed, 32 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 220e9b18e2cd..8a9151cb1622 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -135,6 +135,7 @@ struct mtk_dpi_conf {
u32 channel_swap_shift;
u32 yuv422_en_bit;
u32 csc_enable_bit;
+ bool matrx_sel_support;
};
static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
@@ -398,6 +399,31 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi)
mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, 0, EDGE_SEL_EN);
}
+static void mtk_dpi_matrix_sel(struct mtk_dpi *dpi,
+ enum mtk_dpi_out_color_format format)
+{
+ u32 matrix_sel = 0;
+
+ if (!dpi->conf->matrx_sel_support) {
+ dev_info(dpi->dev, "matrix_sel is not supported.\n");
+ return;
+ }
+
+ switch (format) {
+ case MTK_DPI_COLOR_FORMAT_YCBCR_422:
+ case MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL:
+ case MTK_DPI_COLOR_FORMAT_YCBCR_444:
+ case MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL:
+ case MTK_DPI_COLOR_FORMAT_XV_YCC:
+ if (dpi->mode.hdisplay <= 720)
+ matrix_sel = 0x2;
+ break;
+ default:
+ break;
+ }
+ mtk_dpi_mask(dpi, DPI_MATRIX_SET, matrix_sel, INT_MATRIX_SEL_MASK);
+}
+
static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,
enum mtk_dpi_out_color_format format)
{
@@ -405,6 +431,7 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,
(format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) {
mtk_dpi_config_yuv422_enable(dpi, false);
mtk_dpi_config_csc_enable(dpi, true);
+ mtk_dpi_matrix_sel(dpi, format);
if (dpi->conf->swap_input_support)
mtk_dpi_config_swap_input(dpi, false);
mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_BGR);
@@ -412,6 +439,7 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,
(format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) {
mtk_dpi_config_yuv422_enable(dpi, true);
mtk_dpi_config_csc_enable(dpi, true);
+ mtk_dpi_matrix_sel(dpi, format);
if (dpi->conf->swap_input_support)
mtk_dpi_config_swap_input(dpi, true);
else
@@ -951,6 +979,7 @@ static const struct mtk_dpi_conf mt8195_dpintf_conf = {
.channel_swap_shift = DPINTF_CH_SWAP,
.yuv422_en_bit = DPINTF_YUV422_EN,
.csc_enable_bit = DPINTF_CSC_ENABLE,
+ .matrx_sel_support = true,
};
static int mtk_dpi_probe(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
index f7f0272dbd6a..96c117202d0d 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
+++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
@@ -230,4 +230,7 @@
#define EDGE_SEL_EN BIT(5)
#define H_FRE_2N BIT(25)
+#define DPI_MATRIX_SET 0xB4
+#define INT_MATRIX_SEL_MASK (0x1F << 0)
+
#endif /* __MTK_DPI_REGS_H */
--
2.18.0
next prev parent reply other threads:[~2022-06-20 12:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 12:10 [PATCH v12 00/14] drm/mediatek: Add MT8195 dp_intf driver Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 01/14] dt-bindings: mediatek,dpi: Add DP_INTF compatible Bo-Chen Chen
2022-06-20 12:25 ` Maxime Ripard
2022-06-20 12:33 ` Rex-BC Chen
2022-06-20 12:10 ` [PATCH v12 02/14] drm/mediatek: dpi: Add support for quantization range Bo-Chen Chen
2022-06-21 1:40 ` CK Hu
2022-06-20 12:10 ` [PATCH v12 03/14] drm/mediatek: dpi: implement a CK/DE pol toggle in SoC config Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 04/14] drm/mediatek: dpi: implement a swap_input " Bo-Chen Chen
2022-06-21 1:44 ` CK Hu
2022-06-20 12:10 ` [PATCH v12 05/14] drm/mediatek: dpi: move dimension mask to " Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 06/14] drm/mediatek: dpi: move hvsize_mask " Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 07/14] drm/mediatek: dpi: move swap_shift " Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 08/14] drm/mediatek: dpi: move the yuv422_en_bit " Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 09/14] drm/mediatek: dpi: move the csc_enable bit " Bo-Chen Chen
2022-06-20 12:10 ` [PATCH v12 10/14] drm/mediatek: dpi: Add dpintf support Bo-Chen Chen
2022-06-21 2:32 ` CK Hu
2022-06-21 8:46 ` Rex-BC Chen
2022-06-20 12:10 ` [PATCH v12 11/14] drm/mediatek: dpi: Add tvd_clk enable/disable flow Bo-Chen Chen
2022-06-21 2:55 ` CK Hu
2022-06-21 3:11 ` Rex-BC Chen
2022-06-21 3:45 ` CK Hu
2022-06-21 3:50 ` Rex-BC Chen
2022-06-21 4:08 ` CK Hu
2022-06-21 5:47 ` Rex-BC Chen
2022-06-21 5:54 ` CK Hu
2022-06-21 5:59 ` Rex-BC Chen
2022-06-20 12:10 ` [PATCH v12 12/14] drm/mediatek: dpi: Add YUV422 output support Bo-Chen Chen
2022-06-21 3:04 ` CK Hu
2022-06-21 8:39 ` Rex-BC Chen
2022-06-20 12:10 ` [PATCH v12 13/14] drm/mediatek: dpi: Only enable dpi after the bridge is enabled Bo-Chen Chen
2022-06-21 3:18 ` CK Hu
2022-06-21 6:02 ` Rex-BC Chen
2022-06-20 12:10 ` Bo-Chen Chen [this message]
2022-06-21 3:33 ` [PATCH v12 14/14] drm/mediatek: dpi: Add matrix_sel helper CK Hu
2022-06-21 8:41 ` Rex-BC Chen
2022-06-21 9:12 ` CK Hu
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=20220620121028.29234-15-rex-bc.chen@mediatek.com \
--to=rex-bc.chen@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=airlied@linux.ie \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--cc=ck.hu@mediatek.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=granquet@baylibre.com \
--cc=jitao.shi@mediatek.com \
--cc=krzysztof.kozlowski+dt@linaro.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=msp@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=wenst@chromium.org \
/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).