From: Dave Airlie <airlied@redhat.com>
Date: Tue, 17 Jun 2025 22:09:27 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2025-06-12' of https://gitlab.freedesktop.org/drm/misc/kerne... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45215c589e7f22641e2fc6f518bcbead71d90f9c;p=thirdparty%2Flinux.git

Merge tag 'drm-misc-next-2025-06-12' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next

drm-misc-next for 6.17:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
 - atomic-helpers: Tune the enable / disable sequence
 - bridge: Add destroy hook
 - color management: Add helpers for hardware gamma LUT handling
 - HDMI: Add CEC handling, YUV420 output support
 - sched: tracing improvements

Driver Changes:
 - hyperv: Move out of simple-kms, drm_panic support
 - i915: drm_panel_follower support
 - imx: Add IMX8qxq Display Controller Support
 - lima: Add Rockchip RK3528 GPU Support
 - nouveau: fence handling cleanup
 - panfrost: Add BO labeling, 64-bit registers access
 - qaic: Add RAS Support
 - rz-du: Add RZ/V2H(P) Support, MIPI-DSI DCS Support
 - sun4i: Add H616 Support
 - tidss: Add TI AM62L Support
 - vkms: YUV and R* formats support

 - bridges:
   - Switched to reference counted drm_bridge allocations

 - panels:
   - Switched to reference counted drm_panel allocations
   - Add support for fwnode-based panel lookup
   - himax-hx8394: Support for Huiling hl055fhv028c
   - ilitek-ili9881c: Support for 7" Raspberry Pi 720x1280
   - panel-edp: Support for KDC KD116N3730A05, N160JCE-ELL CMN,
   - panel-simple: Support for AUO P238HAN01
   - st7701: Support for Winstar wf40eswaa6mnn0
   - visionox-rm69299: Support for rm69299-shift
   - New panels: Renesas R61307, Renesas R69328

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://lore.kernel.org/r/20250612-coucal-of-impossible-cleaning-a5eecf@houat
---

45215c589e7f22641e2fc6f518bcbead71d90f9c
diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 163d092bd973b,4797ed1c21f47..07c91b450f93a
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -2285,12 -2291,6 +2291,12 @@@ static int vc4_hdmi_audio_init(struct v
  		return ret;
  	}
  
 +	ret = drm_connector_hdmi_audio_init(&vc4_hdmi->connector, dev,
- 					    &vc4_hdmi_audio_funcs, 8, false,
++					    &vc4_hdmi_audio_funcs, 8, 0, false,
 +					    -1);
 +	if (ret)
 +		return ret;
 +
  	dai_link->cpus		= &vc4_hdmi->audio.cpu;
  	dai_link->codecs	= &vc4_hdmi->audio.codec;
  	dai_link->platforms	= &vc4_hdmi->audio.platform;