diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-08-26 16:13:49 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 16:17:52 +1000 |
| commit | 316f60a120a8f1dacb574f705d5faf7eac3e6e2a (patch) | |
| tree | 19a50e89792e5214a22d77ade945790b19370b49 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | 4a445f291ac3faa08f56eaeb6e44856b6b72b74c (diff) | |
| download | kernel_samsung_smdk4412-316f60a120a8f1dacb574f705d5faf7eac3e6e2a.zip kernel_samsung_smdk4412-316f60a120a8f1dacb574f705d5faf7eac3e6e2a.tar.gz kernel_samsung_smdk4412-316f60a120a8f1dacb574f705d5faf7eac3e6e2a.tar.bz2 | |
drm/nouveau: Fix suspend on some nv4x AGP cards.
On some nv4x cards (specifically, the ones that use an internal
PCIE->AGP bridge) the AGP controller state isn't preserved after a
suspend/resume cycle, and the AGP control registers have moved from
0x18xx to 0x100xx, so the FW check in nouveau_mem_reset_agp() doesn't
quite work. Check "dev->agp->mode" instead.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 9689d414..c14466b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -355,7 +355,8 @@ nouveau_mem_reset_agp(struct drm_device *dev) /* First of all, disable fast writes, otherwise if it's * already enabled in the AGP bridge and we disable the card's * AGP controller we might be locking ourselves out of it. */ - if (nv_rd32(dev, NV04_PBUS_PCI_NV_19) & PCI_AGP_COMMAND_FW) { + if ((nv_rd32(dev, NV04_PBUS_PCI_NV_19) | + dev->agp->mode) & PCI_AGP_COMMAND_FW) { struct drm_agp_info info; struct drm_agp_mode mode; |