diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-07-28 17:20:57 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 12:21:59 -0700 |
| commit | 140d4baa12b22909676ea2be7cfdc12fa1572720 (patch) | |
| tree | 78a66a01f0b2a71d71928ae908e8f73a09862d48 | |
| parent | 49aed64d0a9e9bce6e848440ed8bcce2d8fab558 (diff) | |
drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads
commit 697bb728d9e2367020aa0c5af7363809d7658e43 upstream.
Userspace has started doing this, which upsets the display class hw
error checking in various unpleasant ways.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 7da7958556a3..981342d142ff 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -979,7 +979,7 @@ nv50_crtc_cursor_show_hide(struct nouveau_crtc *nv_crtc, bool show, bool update) { struct nv50_mast *mast = nv50_mast(nv_crtc->base.dev); - if (show && nv_crtc->cursor.nvbo) + if (show && nv_crtc->cursor.nvbo && nv_crtc->base.enabled) nv50_crtc_cursor_show(nv_crtc); else nv50_crtc_cursor_hide(nv_crtc); |