From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Oct 2022 22:08:25 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2022-10-13' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v6.6.17~6326^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8865dd756f92e6745cac64f4dd50e4dc3b9864cc;p=platform%2Fkernel%2Flinux-rpi.git

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

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
---

8865dd756f92e6745cac64f4dd50e4dc3b9864cc
diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 64f9fea,874c6bd..596e311
--- a/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);