| Message ID | 20200525012859.267433-1-james.hilliard1@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] drm/vc4: hdmi: Silence pixel clock error on -EPROBE_DEFER | expand |
On Sun, May 24, 2020 at 07:28:59PM -0600, James Hilliard wrote: > 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> > --- > no response in over 2 weeks Thanks for poking again, not sure who exactly is supporting drm/vc4 nowadays. Eric at least doesn't work at broadcom anymore. I queued up the patch in drm-misc-next. -Daniel > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 340719238753..6d4ee3f6b445 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -1338,8 +1338,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > > hdmi->pixel_clock = devm_clk_get(dev, "pixel"); > if (IS_ERR(hdmi->pixel_clock)) { > - DRM_ERROR("Failed to get pixel clock\n"); > - return PTR_ERR(hdmi->pixel_clock); > + ret = PTR_ERR(hdmi->pixel_clock); > + if (ret != -EPROBE_DEFER) > + DRM_ERROR("Failed to get pixel clock\n"); > + return ret; > } > hdmi->hsm_clock = devm_clk_get(dev, "hdmi"); > if (IS_ERR(hdmi->hsm_clock)) { > -- > 2.25.1 >
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 340719238753..6d4ee3f6b445 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1338,8 +1338,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) hdmi->pixel_clock = devm_clk_get(dev, "pixel"); if (IS_ERR(hdmi->pixel_clock)) { - DRM_ERROR("Failed to get pixel clock\n"); - return PTR_ERR(hdmi->pixel_clock); + ret = PTR_ERR(hdmi->pixel_clock); + if (ret != -EPROBE_DEFER) + DRM_ERROR("Failed to get pixel clock\n"); + return ret; } hdmi->hsm_clock = devm_clk_get(dev, "hdmi"); if (IS_ERR(hdmi->hsm_clock)) {
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> --- no response in over 2 weeks --- drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)