950-0572-drm-vc4-Don-t-try-disabling-SCDC-on-Pi0-3.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132
  1. From e1ee82fdfdba0b210974cf3ccc0048c5aeb83bc6 Mon Sep 17 00:00:00 2001
  2. From: Dave Stevenson <[email protected]>
  3. Date: Tue, 16 Nov 2021 10:34:34 +0000
  4. Subject: [PATCH] drm/vc4: Don't try disabling SCDC on Pi0-3.
  5. The code that set the scdc_enabled flag to ensure it was
  6. disabled at boot time also ran on Pi0-3 where there is no
  7. SCDC support. This lead to a warning in vc4_hdmi_encoder_post_crtc_disable
  8. due to vc4_hdmi_disable_scrambling being called and trying to
  9. read (and write) register HDMI_SCRAMBLER_CTL which doesn't
  10. exist on those platforms.
  11. Only set the flag should the interface be configured to support
  12. more than HDMI 1.4.
  13. Signed-off-by: Dave Stevenson <[email protected]>
  14. ---
  15. drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++-
  16. 1 file changed, 2 insertions(+), 1 deletion(-)
  17. --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  18. +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  19. @@ -2558,7 +2558,8 @@ static int vc4_hdmi_bind(struct device *
  20. * vc4_hdmi_disable_scrambling() will thus run at boot, make
  21. * sure it's disabled, and avoid any inconsistency.
  22. */
  23. - vc4_hdmi->scdc_enabled = true;
  24. + if (variant->max_pixel_clock > HDMI_14_MAX_TMDS_CLK)
  25. + vc4_hdmi->scdc_enabled = true;
  26. ret = variant->init_resources(vc4_hdmi);
  27. if (ret)