git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From 575fc16e92287349f0ffd8399dd9d7e408954cd4 Mon Sep 17 00:00:00 2001
   2 From: Sandor Yu <Sandor.yu@nxp.com>
   3 Date: Fri, 29 Nov 2019 15:05:03 +0800
   4 Subject: [PATCH] Revert "drm/imx/hdp: fix issue with non-SCDC HDMI sinks"
   5
   6 For HDMI sinks that support HDMI2.0, those video modes have
   7 listed in hdmi1.4 specification should work in hdmi 1.4.
   8 Remove the patch, make sure all video modes can work well
   9 in HDMI2.0 sinks.
  10 For non-SCDC HDMI sinks issue,
  11 it will be fixed with another patch.
  12
  13 This reverts commit 4b6617643f9e3a6f61d42eae39034ddc8d4825af.
  14
  15 Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  16 ---
  17  drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c | 20 ++++++++++----------
  18  1 file changed, 10 insertions(+), 10 deletions(-)
  19
  20 --- a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
  21 +++ b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c
  22 @@ -29,17 +29,11 @@
  23  static void hdmi_sink_config(struct cdns_mhdp_device *mhdp)
  24  {
  25         struct drm_scdc *scdc = &mhdp->connector.base.display_info.hdmi.scdc;
  26 -       struct drm_display_info *di = &mhdp->connector.base.display_info;
  27 -       u8 buff = 0;
  28 -
  29 -       if (scdc->supported || di->color_formats & DRM_COLOR_FORMAT_YCRCB420)
  30 -               mhdp->hdmi.hdmi_type = MODE_HDMI_2_0;
  31 -       else
  32 -               mhdp->hdmi.hdmi_type = MODE_HDMI_1_4;
  33 +       u8 buff;
  34
  35         /* check sink support SCDC or not */
  36 -       if (!scdc->supported) {
  37 -               DRM_INFO("Sink does not support SCDC\n");
  38 +       if (scdc->supported != true) {
  39 +               DRM_INFO("Sink Not Support SCDC\n");
  40                 return;
  41         }
  42
  43 @@ -49,13 +43,19 @@ static void hdmi_sink_config(struct cdns
  44                  * Enable scrambling and TMDS_Bit_Clock_Ratio
  45                  */
  46                 buff = SCDC_TMDS_BIT_CLOCK_RATIO_BY_40 | SCDC_SCRAMBLING_ENABLE;
  47 +               mhdp->hdmi.hdmi_type = MODE_HDMI_2_0;
  48         } else  if (scdc->scrambling.low_rates) {
  49                 /*
  50                  * Enable scrambling and HDMI2.0 when scrambling capability of sink
  51                  * be indicated in the HF-VSDB LTE_340Mcsc_scramble bit
  52                  */
  53                 buff = SCDC_SCRAMBLING_ENABLE;
  54 -       }
  55 +               mhdp->hdmi.hdmi_type = MODE_HDMI_2_0;
  56 +       } else {
  57 +               /* Default work in HDMI1.4 */
  58 +               buff = 0;
  59 +               mhdp->hdmi.hdmi_type = MODE_HDMI_1_4;
  60 +        }
  61
  62         /* TMDS config */
  63         cdns_hdmi_scdc_write(mhdp, 0x20, buff);