Merge branch 'CR_3729_evb_515_DRM__hdmi_4K_keith.zhao' into 'jh7110-5.15.y-devel'
authorandy.hu <andy.hu@starfivetech.com>
Thu, 9 Mar 2023 09:21:12 +0000 (09:21 +0000)
committerandy.hu <andy.hu@starfivetech.com>
Thu, 9 Mar 2023 09:21:12 +0000 (09:21 +0000)
CR 3729 riscv:linux:vout:hdmi

See merge request sdk/linux!736

1  2 
drivers/gpu/drm/verisilicon/inno_hdmi.c

index 892ca45,a16cde9..3c989db
mode 100644,100755..100755
@@@ -1034,9 -1034,26 +1034,9 @@@ static int inno_hdmi_bind(struct devic
                dev_err(dev, "failed to audio init\n");
  
        pm_runtime_use_autosuspend(&pdev->dev);
-       pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
+       pm_runtime_set_autosuspend_delay(&pdev->dev, 5000);
        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");