diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-06-28 06:53:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-06-28 06:53:00 +1000 |
| commit | 9fbceb37c95939182e1409211447a1d3f3db9274 (patch) | |
| tree | c3c1631cbb1f9b89bf238602bbc82371ca307674 /drivers/gpu/drm/display | |
| parent | 6daaa479ac557bc426a7fd2e913b618523fe41fd (diff) | |
| parent | 55e8ff842051b1150461d7595d8f1d033c69d66b (diff) | |
| download | linux-9fbceb37c95939182e1409211447a1d3f3db9274.tar.gz linux-9fbceb37c95939182e1409211447a1d3f3db9274.tar.bz2 linux-9fbceb37c95939182e1409211447a1d3f3db9274.zip | |
Merge tag 'drm-misc-fixes-2025-06-26' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
drm-misc-fixes for v6.16-rc4:
- Fix function signature of drm_writeback_connector_cleanup.
- Use correct HDMI audio bridge in drm_connector_hdmi_audio_init.
- Make HPD work on SN65DSI86.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://lore.kernel.org/r/3dd1d5e1-73b6-4b0c-a208-f7d6235cf530@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/display')
| -rw-r--r-- | drivers/gpu/drm/display/drm_bridge_connector.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 7d2e499ea5de..262e93e07a28 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -708,11 +708,14 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, if (bridge_connector->bridge_hdmi_audio || bridge_connector->bridge_dp_audio) { struct device *dev; + struct drm_bridge *bridge; if (bridge_connector->bridge_hdmi_audio) - dev = bridge_connector->bridge_hdmi_audio->hdmi_audio_dev; + bridge = bridge_connector->bridge_hdmi_audio; else - dev = bridge_connector->bridge_dp_audio->hdmi_audio_dev; + bridge = bridge_connector->bridge_dp_audio; + + dev = bridge->hdmi_audio_dev; ret = drm_connector_hdmi_audio_init(connector, dev, &drm_bridge_connector_hdmi_audio_funcs, |