Add a mtk_dpi_matrix_sel() helper to update the DPI_MATRIX_SET
register depending on the color format.

Signed-off-by: Guillaume Ranquet <granq...@baylibre.com>
---
 drivers/gpu/drm/mediatek/mtk_dpi.c      | 21 +++++++++++++++++++++
 drivers/gpu/drm/mediatek/mtk_dpi_regs.h |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c 
b/drivers/gpu/drm/mediatek/mtk_dpi.c
index a6b6d62a17e7..5b88a7ed5845 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -386,6 +386,25 @@ 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;
+
+       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)
 {
@@ -393,6 +412,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);
@@ -400,6 +420,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);
                mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB);
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h 
b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
index dd47dd3f2e4f..91b32dfffced 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
+++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
@@ -231,6 +231,9 @@
 #define EDGE_SEL_EN                    BIT(5)
 #define H_FRE_2N                       BIT(25)
 
+#define DPI_MATRIX_SET 0xB4
+#define INT_MATRIX_SEL                 BIT(0)
+#define INT_MATRIX_SEL_MASK            (0x1F << 0)
 #define RGB_TO_JPEG                    0x00
 #define RGB_TO_FULL709                 0x01
 #define RGB_TO_BT601                   0x02
-- 
2.35.1

Reply via email to