diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-02-21 09:44:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-02-21 09:44:21 +1000 |
| commit | ef04277600ba63e5826bf4e9f99e902f42a73e4f (patch) | |
| tree | 654d30bce641316c3e7f5ac2276476bb585660ac /include | |
| parent | 8573df341545b7b66cfacf9526b1f7a0de917b9e (diff) | |
| parent | 38b2d8efd03d2e56431b611e3523f0158306451d (diff) | |
| download | linux-stable-ef04277600ba63e5826bf4e9f99e902f42a73e4f.tar.gz linux-stable-ef04277600ba63e5826bf4e9f99e902f42a73e4f.tar.bz2 linux-stable-ef04277600ba63e5826bf4e9f99e902f42a73e4f.zip | |
Merge tag 'drm-misc-next-fixes-2023-02-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes pull:
Contains fixes for DP MST and the panel orientation on an Lenovo
IdeaPad model.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y+4H4C4E6cZcM9+J@linux-uq9g
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/display/drm_dp_mst_helper.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 41fd8352ab65..32c764fb9cb5 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -841,7 +841,8 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_atomic_payload *payload); void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_topology_state *mst_state, - struct drm_dp_mst_atomic_payload *payload); + const struct drm_dp_mst_atomic_payload *old_payload, + struct drm_dp_mst_atomic_payload *new_payload); int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr); @@ -867,6 +868,9 @@ struct drm_dp_mst_topology_state * drm_atomic_get_mst_topology_state(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr); struct drm_dp_mst_topology_state * +drm_atomic_get_old_mst_topology_state(struct drm_atomic_state *state, + struct drm_dp_mst_topology_mgr *mgr); +struct drm_dp_mst_topology_state * drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr); struct drm_dp_mst_atomic_payload * |