openwrt/target/linux/bcm27xx/patches-5.4/950-0641-drm-vc4-hdmi-Silence-pixel-clock-error-on-EPROBE_DEF.patch

30 lines
1.0 KiB
Diff
Raw Normal View History

From ba875ce27cd407bc61502517671623df07bb6c1a Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Fri, 10 Apr 2020 19:24:40 -0600
Subject: [PATCH] drm/vc4: hdmi: Silence pixel clock error on
-EPROBE_DEFER
If the vc4 hdmi driver loads before the pixel clock is available we
see a spurious "*ERROR* Failed to get pixel clock" error.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1493,8 +1493,10 @@ static int vc4_hdmi_init_resources(struc
vc4_hdmi->pixel_clock = devm_clk_get(dev, "pixel");
if (IS_ERR(vc4_hdmi->pixel_clock)) {
- DRM_ERROR("Failed to get pixel clock\n");
- return PTR_ERR(vc4_hdmi->pixel_clock);
+ ret = PTR_ERR(vc4_hdmi->pixel_clock);
+ if (ret != -EPROBE_DEFER)
+ DRM_ERROR("Failed to get pixel clock\n");
+ return ret;
}
vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi");