diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-05-23 08:01:38 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-05-23 08:01:39 +0200 |
| commit | 32a0bb7ef217aa37e6b67ca7950f5e504312ed72 (patch) | |
| tree | 6926ae3a68e18051f04ad0a11ac94b12dd78a166 /include | |
| parent | Merge tag 'amd-drm-fixes-6.10-2024-05-22' of https://gitlab.freedesktop.org/a... (diff) | |
| parent | drm/mst: Fix NULL pointer dereference at drm_dp_add_payload_part2 (diff) | |
| download | linux-32a0bb7ef217aa37e6b67ca7950f5e504312ed72.tar.xz linux-32a0bb7ef217aa37e6b67ca7950f5e504312ed72.zip | |
Merge tag 'drm-misc-next-fixes-2024-05-23' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next-fixes for v6.10-rc1:
- MST null deref fix.
- Don't let next bridge create connector in adv7511 to make probe work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f171b14a-ed6b-4124-893b-802a336dbe2b@linux.intel.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/display/drm_dp_mst_helper.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 3546b58a121b..cfe096389d94 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -871,7 +871,6 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_topology_state *mst_state, struct drm_dp_mst_atomic_payload *payload); int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, - struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload *payload); void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_topology_state *mst_state, |