diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-01-30 15:37:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-01-30 15:37:57 +1000 |
| commit | 155c6b16eec2eaaaf6c71abf2d5e71641770d7ba (patch) | |
| tree | c8729990eb054c66e7e0b7fc44ea81d6c27b8b4c /drivers/gpu/drm/display | |
| parent | dae437d568bbc3d4211b88d23fa0868a5019caf6 (diff) | |
| parent | cdf657fc1f4c9758f86ae3adeb32ee68cbd90691 (diff) | |
| download | linux-stable-155c6b16eec2eaaaf6c71abf2d5e71641770d7ba.tar.gz linux-stable-155c6b16eec2eaaaf6c71abf2d5e71641770d7ba.tar.bz2 linux-stable-155c6b16eec2eaaaf6c71abf2d5e71641770d7ba.zip | |
Merge tag 'amd-drm-next-6.3-2023-01-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.3-2023-01-27:
amdgpu:
- GC11 fixes
- SMU13 fixes
- Freesync fixes
- DP MST fixes
- DP MST code rework and cleanup
- AV1 fixes for VCN4
- DCN 3.2.x fixes
- PSR fixes
- DML optimizations
- DC link code rework
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230127225917.2419162-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/display')
| -rw-r--r-- | drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 5861b0a6247b..847c10aa2098 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -3377,6 +3377,9 @@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr, mgr->payload_count--; mgr->next_start_slot -= payload->time_slots; + + if (payload->delete) + drm_dp_mst_put_port_malloc(payload->port); } EXPORT_SYMBOL(drm_dp_remove_payload); @@ -4335,7 +4338,6 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state, drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots); if (!payload->delete) { - drm_dp_mst_put_port_malloc(port); payload->pbn = 0; payload->delete = true; topology_state->payload_mask &= ~BIT(payload->vcpi - 1); |