diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 16:44:10 +0800 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 16:44:10 +0800 |
| commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
| tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /drivers/gpu/drm/nouveau/nouveau_vga.c | |
| parent | a3dbeb5b45af5b6113385db89fce2a8279278e8b (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
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 81638d7f2ef..471347edc27 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); |