diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2019-05-03 04:23:55 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2019-05-14 08:58:05 +0200 |
| commit | d2434e4d942c32cadcbdbcd32c58f35098f3b604 (patch) | |
| tree | db2523ef61d30eb8bc6944ba2275bef41d951c18 /drivers/gpu/drm/nouveau/dispnv50/disp.h | |
| parent | drm/nouveau/nouveau: forward error generated while resuming objects tree (diff) | |
| download | linux-d2434e4d942c32cadcbdbcd32c58f35098f3b604.tar.xz linux-d2434e4d942c32cadcbdbcd32c58f35098f3b604.zip | |
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/disp.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/disp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h index 2216c58620c2..7c41b0599d1a 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h @@ -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); |