aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2016-09-28 20:21:05 -0400
committerEric Anholt <eric@anholt.net>2016-10-06 14:58:27 -0400
commit2b29bf16611a1aabb310406dd171dce6e6d51322 (patch)
treed7a2c8e67760067e292c8aeec9cefbc08645b560
parent9d44abbbb8d530e8cc97d71ffcbc0ff3b5553c62 (diff)
drm/vc4: Increase timeout for HDMI_SCHEDULER_CONTROL changes.
Fixes occasional debug spew at boot when connected directly through HDMI, and probably confusing the HDMI state machine when we go trying to poke registers for the enable sequence too soon. Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/vc4/vc4_hdmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 1e61931846d3..fe1c4e35e681 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -424,7 +424,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
424 VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI); 424 VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
425 425
426 ret = wait_for(HDMI_READ(VC4_HDMI_SCHEDULER_CONTROL) & 426 ret = wait_for(HDMI_READ(VC4_HDMI_SCHEDULER_CONTROL) &
427 VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE, 1); 427 VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE, 1000);
428 WARN_ONCE(ret, "Timeout waiting for " 428 WARN_ONCE(ret, "Timeout waiting for "
429 "VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n"); 429 "VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n");
430 } else { 430 } else {
@@ -436,7 +436,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
436 ~VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI); 436 ~VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
437 437
438 ret = wait_for(!(HDMI_READ(VC4_HDMI_SCHEDULER_CONTROL) & 438 ret = wait_for(!(HDMI_READ(VC4_HDMI_SCHEDULER_CONTROL) &
439 VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE), 1); 439 VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE), 1000);
440 WARN_ONCE(ret, "Timeout waiting for " 440 WARN_ONCE(ret, "Timeout waiting for "
441 "!VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n"); 441 "!VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n");
442 } 442 }