Skip to content

Commit 8fb3e25

Browse files
committed
drm/nouveau/kms/nv50-: Fix drm_dp_remove_payload() invocation
We changed the semantics for this in: commit e761cc2 ("drm/display/dp_mst: Handle old/new payload states in drm_dp_remove_payload()") But I totally forgot to update this properly in nouveau. So, let's do that. Signed-off-by: Lyude Paul <[email protected]> Reviewed-by: Karol Herbst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 0c3855b commit 8fb3e25

File tree

1 file changed

+6
-2
lines changed
  • drivers/gpu/drm/nouveau/dispnv50

1 file changed

+6
-2
lines changed

drivers/gpu/drm/nouveau/dispnv50/disp.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,15 +909,19 @@ nv50_msto_prepare(struct drm_atomic_state *state,
909909
struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
910910
struct nv50_mstc *mstc = msto->mstc;
911911
struct nv50_mstm *mstm = mstc->mstm;
912-
struct drm_dp_mst_atomic_payload *payload;
912+
struct drm_dp_mst_topology_state *old_mst_state;
913+
struct drm_dp_mst_atomic_payload *payload, *old_payload;
913914

914915
NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
915916

917+
old_mst_state = drm_atomic_get_old_mst_topology_state(state, mgr);
918+
916919
payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port);
920+
old_payload = drm_atomic_get_mst_payload_state(old_mst_state, mstc->port);
917921

918922
// TODO: Figure out if we want to do a better job of handling VCPI allocation failures here?
919923
if (msto->disabled) {
920-
drm_dp_remove_payload(mgr, mst_state, payload, payload);
924+
drm_dp_remove_payload(mgr, mst_state, old_payload, payload);
921925

922926
nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0);
923927
} else {

0 commit comments

Comments
 (0)