target/linux/brcm2708/patches-4.4/0514-drm-vc4-Increase-timeout-for-HDMI_SCHEDULER_CONTROL-.patch

   1 From 4fe0280a07dea7997dd8a789c704f69b5620cdd2 Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Wed, 28 Sep 2016 17:21:05 -0700
   4 Subject: [PATCH] drm/vc4: Increase timeout for HDMI_SCHEDULER_CONTROL changes.
   5
   6 Fixes occasional debug spew at boot when connected directly through
   7 HDMI, and probably confusing the HDMI state machine when we go trying
   8 to poke registers for the enable sequence too soon.
   9
  10 Signed-off-by: Eric Anholt <eric@anholt.net>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++--
  13  1 file changed, 2 insertions(+), 2 deletions(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  17 @@ -408,7 +408,7 @@ static void vc4_hdmi_encoder_enable(stru
  18                            VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
  19
  20                 ret = wait_for(HDMI_READ(VC4_HDMI_SCHEDULER_CONTROL) &
  21 -                              VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE, 1);
  22 +                              VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE, 1000);
  23                 WARN_ONCE(ret, "Timeout waiting for "
  24                           "VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n");
  25         } else {
  26 @@ -420,7 +420,7 @@ static void vc4_hdmi_encoder_enable(stru
  27                            ~VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
  28
  29                 ret = wait_for(!(HDMI_READ(VC4_HDMI_SCHEDULER_CONTROL) &
  30 -                                VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE), 1);
  31 +                                VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE), 1000);
  32                 WARN_ONCE(ret, "Timeout waiting for "
  33                           "!VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n");
  34         }