Merge tag 'drm-misc-next-2023-09-27' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_helpers.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index cbef4ff28cd8a6ecb664be7594e7ca7998224814..baf7e5254fb3e6a42ebd668553f3bd3ddffeeb9a 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -343,7 +343,7 @@ bool dm_helpers_dp_mst_send_payload_allocation(
        struct amdgpu_dm_connector *aconnector;
        struct drm_dp_mst_topology_state *mst_state;
        struct drm_dp_mst_topology_mgr *mst_mgr;
-       struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
+       struct drm_dp_mst_atomic_payload *new_payload, old_payload;
        enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD;
        enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
        int ret = 0;
@@ -367,8 +367,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(
                ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, new_payload);
        } else {
                dm_helpers_construct_old_payload(stream->link, mst_state->pbn_div,
-                                                new_payload, old_payload);
-               drm_dp_remove_payload_part2(mst_mgr, mst_state, old_payload, new_payload);
+                                                new_payload, &old_payload);
+               drm_dp_remove_payload_part2(mst_mgr, mst_state, &old_payload, new_payload);
        }
 
        if (ret) {