projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b7eea2d
)
drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 28 Jul 2015 07:20:57 +0000
(17:20 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 28 Jul 2015 07:22:13 +0000
(17:22 +1000)
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>
drivers/gpu/drm/nouveau/nv50_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv50_display.c
b/drivers/gpu/drm/nouveau/nv50_display.c
index
7da7958
..
981342d
100644
(file)
--- 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);