Merge tag 'drm-misc-fixes-2022-10-13' of git://anongit.freedesktop.org/drm/drm-misc...

Short summary of fixes pull:

 * vc4: HDMI fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y0gGdlujszCstDeP@linux-uq9g

diff --cc drivers/gpu/drm/vc4/vc4_drv.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 64f9feabf43ef92c63ad7f8c4e164650e452d7e4,874c6bd787c5667c8ec73d6d1d29bbced9f25b17..596e311d6e58eaf7c2c914b531643f7d34979052
--- 1/drivers/gpu/drm/vc4/vc4_hdmi.c
--- 2/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -3345,15 -2921,12 +3370,19 @@@ static int vc4_hdmi_runtime_resume(stru
  #endif
  
        return 0;
+ 
+ err_disable_clk:
+       clk_disable_unprepare(vc4_hdmi->hsm_clock);
+       return ret;
  }
  
 +static void vc4_hdmi_put_ddc_device(void *ptr)
 +{
 +      struct vc4_hdmi *vc4_hdmi = ptr;
 +
 +      put_device(&vc4_hdmi->ddc->dev);
 +}
 +
  static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
  {
        const struct vc4_hdmi_variant *variant = of_device_get_match_data(dev);