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

   1 From faa24f47c0066893e0b7772befe378bde4dc2ff9 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Mon, 25 Oct 2021 17:28:54 +0200
   4 Subject: [PATCH] drm/vc4: hdmi: Remove the DDC probing for status
   5  detection
   6
   7 Commit 9d44abbbb8d5 ("drm/vc4: Fall back to using an EDID probe in the
   8 absence of a GPIO.") added some code to read the EDID through DDC in the
   9 HDMI driver detect hook since the Pi3 had no HPD GPIO back then.
  10 However, commit b1b8f45b3130 ("ARM: dts: bcm2837: Add missing GPIOs of
  11 Expander") changed that a couple of years later.
  12
  13 This causes an issue though since some TV (like the LG 55C8) when it
  14 comes out of standy will deassert the HPD line, but the EDID will
  15 remain readable.
  16
  17 It causes an issues nn platforms without an HPD GPIO, like the Pi4,
  18 where the DDC probing will be our primary mean to detect a display, and
  19 thus we will never detect the HPD pulse. This was fine before since the
  20 pulse was small enough that we would never detect it, and we also didn't
  21 have anything (like the scrambler) that needed to be set up in the
  22 display.
  23
  24 However, now that we have both, the display during the HPD pulse will
  25 clear its scrambler status, and since we won't detect the
  26 disconnect/reconnect cycle we will never enable the scrambler back.
  27
  28 As our main reason for that DDC probing is gone, let's just remove it.
  29
  30 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  31 Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  32 Link: https://lore.kernel.org/r/20211025152903.1088803-2-maxime@cerno.tech
  33 ---
  34  drivers/gpu/drm/vc4/vc4_hdmi.c | 2 --
  35  1 file changed, 2 deletions(-)
  36
  37 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  38 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  39 @@ -176,8 +176,6 @@ vc4_hdmi_connector_detect(struct drm_con
  40         if (vc4_hdmi->hpd_gpio &&
  41             gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio)) {
  42                 connected = true;
  43 -       } else if (drm_probe_ddc(vc4_hdmi->ddc)) {
  44 -               connected = true;
  45         } else if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) {
  46                 connected = true;
  47         }