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

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