diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2019-05-03 12:23:55 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2019-05-14 16:58:05 +1000 |
| commit | d2434e4d942c32cadcbdbcd32c58f35098f3b604 (patch) | |
| tree | db2523ef61d30eb8bc6944ba2275bef41d951c18 /drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | |
| parent | 30df16b93b25fe345e4c5d4e9c789d3f4f337b72 (diff) | |
| download | linux-d2434e4d942c32cadcbdbcd32c58f35098f3b604.tar.bz2 | |
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: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c index 9103b8494279..f7dbd965e4e7 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c @@ -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; } |