diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-01-17 10:43:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-01-17 10:43:21 +1000 |
| commit | 951a6bf30667307e7901aac5e74e50dadd5ccfc7 (patch) | |
| tree | 75b29443eda8cec01f25c29b992e0de33c6993eb /include | |
| parent | 24c61d553302ee49e9c21dd251275ba8c36dcfe4 (diff) | |
| parent | f1359f46f1f1305340970b5073240126fe87254f (diff) | |
Merge tag 'drm-misc-next-fixes-2025-01-16' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Several fixes for the new dmem cgroup controller and the HDMI framework
audio support
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250116-bold-furry-perch-b1ca0e@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/display/drm_hdmi_state_helper.h | 1 | ||||
| -rw-r--r-- | include/drm/drm_bridge.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/display/drm_hdmi_state_helper.h b/include/drm/display/drm_hdmi_state_helper.h index 9ae19f3caf72..44ec5c4a7503 100644 --- a/include/drm/display/drm_hdmi_state_helper.h +++ b/include/drm/display/drm_hdmi_state_helper.h @@ -6,6 +6,7 @@ struct drm_atomic_state; struct drm_connector; struct drm_connector_state; +struct drm_display_mode; struct hdmi_audio_infoframe; enum drm_connector_status; diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 4b84faf14e36..496dbbd2ad7e 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -691,7 +691,7 @@ struct drm_bridge_funcs { struct drm_bridge *bridge); /** - * @prepare: + * @hdmi_audio_prepare: * Configures HDMI-encoder for audio stream. Can be called multiple * times for each setup. Mandatory if HDMI audio is enabled in the * bridge's configuration. |