projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa8c9ac
)
drm/nv4c/vga: decode register is in a different place on nv4x igp's
author
Ilia Mirkin
<imirkin@alum.mit.edu>
Wed, 5 Feb 2014 19:33:03 +0000
(14:33 -0500)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 18 Feb 2014 00:36:49 +0000
(10:36 +1000)
Suggested-by: Marcin KoĆcielnicki <koriakin@0x04.net>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_vga.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_vga.c
b/drivers/gpu/drm/nouveau/nouveau_vga.c
index
81638d7
..
471347e
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_vga.c
@@
-14,7
+14,9
@@
nouveau_vga_set_decode(void *priv, bool state)
{
struct nouveau_device *device = nouveau_dev(priv);
- if (device->chipset >= 0x40)
+ if (device->card_type == NV_40 && device->chipset >= 0x4c)
+ nv_wr32(device, 0x088060, state);
+ else if (device->chipset >= 0x40)
nv_wr32(device, 0x088054, state);
else
nv_wr32(device, 0x001854, state);