diff options
| author |   Ilia Mirkin <imirkin@alum.mit.edu> | 2014-02-05 14:33:03 -0500 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2014-02-18 10:36:49 +1000 |
| commit | b71313e14bbc0b8fc25eeff53828ab8e2aee4f25 (patch) | |
| tree | 9e0d742184ab88ca71d83eacf22ed32ceee226b8 /drivers/gpu/drm/nouveau/nouveau_vga.c | |
| parent | drm/nv4c/mc: nv4x igp's have a different msi rearm register (diff) | |
| download | linux-dev-b71313e14bbc0b8fc25eeff53828ab8e2aee4f25.tar.xz linux-dev-b71313e14bbc0b8fc25eeff53828ab8e2aee4f25.zip | |
drm/nv4c/vga: decode register is in a different place on nv4x igp's
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_vga.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_vga.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index 81638d7f2eff..471347edc27e 100644 --- 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); |