Commit d2434e4d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/gv100-: fix spurious window immediate interlocks 



Cursor position updates were accidentally causing us to attempt to interlock
window with window immediate, and without a matching window immediate update,
NVDisplay could hang forever in some circumstances.

Fixes suspend/resume on (at least) Quadro RTX4000 (TU104).

Reported-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 30df16b9

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct nv50_disp_interlock { 
		NV50_DISP_INTERLOCK__SIZE

	} type;

	u32 data;

	u32 wimm;

};



void corec37d_ntfy_init(struct nouveau_bo *, u32);

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

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, 
		return ret;

	}



	wndw->interlock.wimm = wndw->interlock.data;

	wndw->immd = func;

	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ nv50_wndw_flush_set(struct nv50_wndw *wndw, u32 *interlock, 
	if (asyw->set.point) {

		if (asyw->set.point = false, asyw->set.mask)

			interlock[wndw->interlock.type] |= wndw->interlock.data;

		interlock[NV50_DISP_INTERLOCK_WIMM] |= wndw->interlock.data;

		interlock[NV50_DISP_INTERLOCK_WIMM] |= wndw->interlock.wimm;



		wndw->immd->point(wndw, asyw);

		wndw->immd->update(wndw, interlock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE