riscv:linux:vout: rollback rgb code to tag JH7110_515_SDK_v4.4.0

rollback rgb code to tag JH7110_515_SDK_v4.4.0 after porting patch-rgb support 1080P@60fps

Signed-off-by: shengyang.chen<shengyang.chen@starfivetech.com>

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
old mode 100755 (executable)
new mode 100644 (file)
index 70a7d0e..fecfb48
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1392,21 +1392,13 @@ static enum drm_mode_status tda998x_bridge_mode_valid(struct drm_bridge *bridge,
                return MODE_BAD_HVALUE;
        if (mode->vtotal >= BIT(11))
                return MODE_BAD_VVALUE;
-       
-       //if ((mode->hdisplay == 1280)&&(mode->vdisplay == 720)&&(mode->clock == 74250))
+       //u32 vic = drm_match_cea_mode(mode);
+
+       //if (vic >= 1)
        //      return MODE_OK;
-       if ((mode->hdisplay == 1920)&&(mode->vdisplay == 1080)&&(mode->clock == 148500))
-       {
-               u32 vic = drm_match_cea_mode(mode);
-               //printk("====> %s, %d--vic ============== %d.\n", __func__, __LINE__,vic);
-               if(vic == 16)
-                       return MODE_OK;
-               else
-                       return MODE_BAD;
-       }else
-               return MODE_BAD;
-
-       //return MODE_OK;
+       //else
+       //      return MODE_BAD;
+       return MODE_OK;
 }
 
 static void tda998x_bridge_enable(struct drm_bridge *bridge)

diff --git a/drivers/gpu/drm/verisilicon/inno_hdmi.c b/drivers/gpu/drm/verisilicon/inno_hdmi.c
index d73a58a..892ca45 100644 (file)
--- a/drivers/gpu/drm/verisilicon/inno_hdmi.c
+++ b/drivers/gpu/drm/verisilicon/inno_hdmi.c
@@ -1037,23 +1037,6 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
        pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
        pm_runtime_enable(&pdev->dev);
 
-#ifdef CONFIG_DRM_I2C_NXP_TDA998X
-       hdmi->hdmi_data.vic = 0x10;
-       u8 val;
-
-       val = readl_relaxed(hdmi->regs + (0x1b0) * 0x04);
-       val |= 0x4;
-       hdmi_writeb(hdmi, 0x1b0, val);
-       hdmi_writeb(hdmi, 0x1cc, 0xf);
-       //hdmi->hdmi_data.vic = drm_match_cea_mode(mode);
-
-       hdmi->tmds_rate = 148500 * 1000;
-       inno_hdmi_phy_clk_set_rate(hdmi,hdmi->tmds_rate);
-
-       while (!(hdmi_readb(hdmi, 0x1a9) & 0x1));
-       while (!(hdmi_readb(hdmi, 0x1af) & 0x1));
-#endif
-
        inno_hdmi_disable_clk_assert_rst(dev, hdmi);
 
        dev_info(dev, "inno hdmi bind end\n");