VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   34 Branches   58 Tags
author: andy.hu <andy.hu@starfivetech.com> 2023-03-09 08:46:37 +0000 committer: andy.hu <andy.hu@starfivetech.com> 2023-03-09 08:46:37 +0000 commit: 78b16722954b3f66ab03b3d6b163c47ac54a7820 parent: 1ee0d0608574314b4db35cb8aaa4300588516783
Commit Summary:
Merge branch 'CR_3746_evb_510_rgb_1080_60_porting_rollback_shengyang.chen' into 'jh7110-5.10.y-devel'
Diffstat:
2 files changed, 5 insertions, 27 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
old mode 100755
new mode 100644
index 70a7d0ecb604..fecfb4870e2e
--- 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 e7e1ff5f115c..6cf29f9f80c4 100644
--- a/drivers/gpu/drm/verisilicon/inno_hdmi.c
+++ b/drivers/gpu/drm/verisilicon/inno_hdmi.c
@@ -1035,23 +1035,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");