rk3036 hdmi: update CSC code style

diff --git a/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.c
index ac8d06a05f7f814ebec6dac54cdfe9e36ff305d9..4fd7ada73849770a595b74f76e314b5cb0012762 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.c
@@ -252,13 +252,13 @@ static const char coeff_csc[][24] = {
            Y   = 0.504G   + 0.257R + 0.098B + 16
            Cr  = -0.368G + 0.439R - 0.071B + 128*/
        {
-       //0x11, 0x78, 0x01, 0xc1, 0x10, 0x48, 0x00, 0x80,
-       //0x02, 0x04, 0x01, 0x07, 0x00, 0x64, 0x00, 0x10,
-       //0x11, 0x29, 0x10, 0x97, 0x01, 0xc1, 0x00, 0x80
+       /*0x11, 0x78, 0x01, 0xc1, 0x10, 0x48, 0x00, 0x80,
+       0x02, 0x04, 0x01, 0x07, 0x00, 0x64, 0x00, 0x10,
+       0x11, 0x29, 0x10, 0x97, 0x01, 0xc1, 0x00, 0x80*/
 
-       //0x11,0x4b,0x01,0x8a,0x10,0x3f,0x00,0x80,
-       //0x01,0xbb,0x00,0xe2,0x00,0x56,0x00,0x1d,
-       //0x11,0x05,0x10,0x85,0x01,0x8a,0x00,0x80
+       /*0x11,0x4b,0x01,0x8a,0x10,0x3f,0x00,0x80,
+       0x01,0xbb,0x00,0xe2,0x00,0x56,0x00,0x1d,
+       0x11,0x05,0x10,0x85,0x01,0x8a,0x00,0x80*/
 
        0x11,0x5f,0x01,0x82,0x10,0x23,0x00,0x80,
        0x02,0x1c,0x00,0xa1,0x00,0x36,0x00,0x1e,
@@ -286,7 +286,7 @@ static const char coeff_csc[][24] = {
 static int rk3036_hdmi_video_csc(struct hdmi *hdmi_drv,
                                        struct hdmi_video_para *vpara)
 {
-       int value,i;
+       int value,i,csc_mode,c0_c2_change,auto_csc,csc_enable;
        const char *coeff = NULL;
        struct rk_hdmi_device *hdmi_dev = container_of(hdmi_drv,
                                                        struct rk_hdmi_device,
@@ -294,6 +294,92 @@ static int rk3036_hdmi_video_csc(struct hdmi *hdmi_drv,
        /* Enable or disalbe color space convert */
        hdmi_dbg(hdmi_drv->dev, "[%s] input_color=%d,output_color=%d\n",
                 __func__, vpara->input_color, vpara->output_color);
+       if (vpara->input_color == vpara->output_color) {
+               if ((vpara->input_color >= VIDEO_INPUT_COLOR_YCBCR444) ||
+                 ((vpara->input_color == VIDEO_INPUT_COLOR_RGB) &&
+                 (vpara->color_limit_range == COLOR_LIMIT_RANGE_0_255))) {
+                       value = v_SOF_DISABLE;
+                       hdmi_writel(hdmi_dev, VIDEO_CONTRL3, value);
+                       hdmi_msk_reg(hdmi_dev, VIDEO_CONTRL,
+                                    m_VIDEO_AUTO_CSC | m_VIDEO_C0_C2_EXCHANGE,
+                                    v_VIDEO_AUTO_CSC(AUTO_CSC_DISABLE) |
+                                    v_VIDEO_C0_C2_EXCHANGE(C0_C2_CHANGE_DISABLE));
+                       return 0;
+               } else if ((vpara->input_color == VIDEO_INPUT_COLOR_RGB) &&
+                          (vpara->color_limit_range == COLOR_LIMIT_RANGE_16_235)) {
+                       csc_mode = CSC_RGB_0_255_TO_RGB_16_235_8BIT;
+                       auto_csc = AUTO_CSC_DISABLE;
+                       c0_c2_change = C0_C2_CHANGE_DISABLE;
+                       csc_enable = v_CSC_ENABLE;
+               }
+       }
+
+       switch (vpara->vic) {
+       case HDMI_720x480i_60Hz_4_3:
+       case HDMI_720x576i_50Hz_4_3:
+       case HDMI_720x480p_60Hz_4_3:
+       case HDMI_720x576p_50Hz_4_3:
+       case HDMI_720x480i_60Hz_16_9:
+       case HDMI_720x576i_50Hz_16_9:
+       case HDMI_720x480p_60Hz_16_9:
+       case HDMI_720x576p_50Hz_16_9:
+               if (vpara->input_color == VIDEO_INPUT_COLOR_RGB
+                   && vpara->output_color >= VIDEO_OUTPUT_YCBCR444) {
+                       csc_mode = CSC_RGB_0_255_TO_ITU601_16_235_8BIT;
+                       auto_csc = AUTO_CSC_DISABLE;
+                       c0_c2_change = C0_C2_CHANGE_DISABLE;
+                       csc_enable = v_CSC_ENABLE;
+               } else if (vpara->input_color >= VIDEO_OUTPUT_YCBCR444
+                          && vpara->output_color == VIDEO_OUTPUT_RGB444) {
+#ifdef AUTO_DEFINE_CSC
+                       csc_mode = CSC_ITU601_16_235_TO_RGB_0_255_8BIT;
+                       auto_csc = AUTO_CSC_ENABLE;
+                       c0_c2_change = C0_C2_CHANGE_DISABLE;
+                       csc_enable = v_CSC_DISABLE;
+#else
+                       csc_mode = CSC_ITU601_16_235_TO_RGB_0_255_8BIT;
+                       auto_csc = AUTO_CSC_DISABLE;
+                       c0_c2_change = C0_C2_CHANGE_ENABLE;
+                       csc_enable = v_CSC_ENABLE;
+#endif
+               }
+               break;
+       default:
+               if (vpara->input_color == VIDEO_INPUT_COLOR_RGB
+                   && vpara->output_color >= VIDEO_OUTPUT_YCBCR444) {
+                       csc_mode = CSC_RGB_0_255_TO_ITU709_16_235_8BIT;
+                       auto_csc = AUTO_CSC_DISABLE;
+                       c0_c2_change = C0_C2_CHANGE_DISABLE;
+                       csc_enable = v_CSC_ENABLE;
+               } else if (vpara->input_color >= VIDEO_OUTPUT_YCBCR444
+                          && vpara->output_color == VIDEO_OUTPUT_RGB444) {
+#ifdef AUTO_DEFINE_CSC
+                       csc_mode = CSC_ITU709_16_235_TO_RGB_0_255_8BIT;
+                       auto_csc = AUTO_CSC_ENABLE;
+                       c0_c2_change = C0_C2_CHANGE_DISABLE;
+                       csc_enable = v_CSC_DISABLE;
+#else
+                       csc_mode = CSC_ITU601_16_235_TO_RGB_0_255_8BIT;//CSC_ITU709_16_235_TO_RGB_0_255_8BIT;
+                       auto_csc = AUTO_CSC_DISABLE;
+                       c0_c2_change = C0_C2_CHANGE_ENABLE;
+                       csc_enable = v_CSC_ENABLE;
+#endif
+               }
+               break;
+       }
+
+       coeff = coeff_csc[csc_mode];
+       for (i = 0; i < 24; i++) {
+               hdmi_writel(hdmi_dev, VIDEO_CSC_COEF+i, coeff[i]);
+       }
+
+       value = v_SOF_DISABLE | csc_enable;
+       hdmi_writel(hdmi_dev, VIDEO_CONTRL3, value);
+       hdmi_msk_reg(hdmi_dev, VIDEO_CONTRL,
+                    m_VIDEO_AUTO_CSC | m_VIDEO_C0_C2_EXCHANGE,
+                    v_VIDEO_AUTO_CSC(auto_csc) | v_VIDEO_C0_C2_EXCHANGE(c0_c2_change));
+
+#if 0
        if (vpara->input_color != vpara->output_color) {
                if(vpara->input_color == VIDEO_INPUT_COLOR_RGB) {/*rgb2yuv*/
                        coeff = coeff_csc[3];
@@ -352,7 +438,7 @@ static int rk3036_hdmi_video_csc(struct hdmi *hdmi_drv,
                                     v_VIDEO_AUTO_CSC(0) | v_VIDEO_C0_C2_EXCHANGE(1));
                }
        }
-
+#endif
        return 0;
 }
 

diff --git a/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.h b/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.h
index d60bafe99d4879398d0d12e78b933afc68a8371c..7f70adbb11044c9d57a7d31da8be1cbb887e4c9c 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.h
+++ b/drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.h
@@ -12,7 +12,37 @@ enum {
        OUTPUT_DVI = 0,
        OUTPUT_HDMI
 };
-//#define AUTO_DEFINE_CSC
+
+/* C0 C2 Change */
+enum {
+       C0_C2_CHANGE_ENABLE,    /* enable c0 c2 change*/
+       C0_C2_CHANGE_DISABLE    /* disable c0 c2 change*/
+};
+
+/* Auto CSC mode enable */
+enum {
+       AUTO_CSC_DISABLE,       /* disable auto csc*/
+       AUTO_CSC_ENABLE /* enable auto csc*/
+};
+
+
+/* Color Limit Range */
+enum {
+       COLOR_LIMIT_RANGE_0_255,        /* Color Limit Range 0 To 255*/
+       COLOR_LIMIT_RANGE_16_235,       /* Color Limit Range 16 To 235*/
+};
+/* Color Space Convertion Mode */
+enum {
+       CSC_ITU601_16_235_TO_RGB_0_255_8BIT,    /* YCbCr 16-235 input to RGB 0-255 output according BT601 that is 8bit clolor depth */
+       CSC_ITU601_0_255_TO_RGB_0_255_8BIT,     /* YCbCr 0-255 input to RGB 0-255 output according BT601 that is 8bit clolor depth */
+       CSC_ITU709_16_235_TO_RGB_0_255_8BIT,    /* YCbCr 16-235 input to RGB 0-255 output according BT709 that is 8bit clolor depth */
+       CSC_RGB_0_255_TO_ITU601_16_235_8BIT,    /* RGB 0-255 input to YCbCr 16-235 output according BT601 that is 8bit clolor depth */
+       CSC_RGB_0_255_TO_ITU709_16_235_8BIT,    /* RGB 0-255 input to YCbCr 16-235 output accroding BT709 that is 8bit clolor depth */
+       CSC_RGB_0_255_TO_RGB_16_235_8BIT,       /* RGB 0-255 input to RGB 16-235 output that is 8bit clolor depth */
+};
+
+
+#define AUTO_DEFINE_CSC
 #ifdef RK616_USE_MCLK_12M
 #define HDMI_SYS_FREG_CLK        12000000
 #else