Commit 697bb728 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads

Userspace has started doing this, which upsets the display class hw
error checking in various unpleasant ways.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b7eea2d7
...@@ -979,7 +979,7 @@ nv50_crtc_cursor_show_hide(struct nouveau_crtc *nv_crtc, bool show, bool update) ...@@ -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); 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); nv50_crtc_cursor_show(nv_crtc);
else else
nv50_crtc_cursor_hide(nv_crtc); nv50_crtc_cursor_hide(nv_crtc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment