drm/nouveau: Fix suspend on some nv4x AGP cards.
authorFrancisco Jerez <currojerez@riseup.net>
Thu, 26 Aug 2010 14:13:49 +0000 (16:13 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 24 Sep 2010 06:17:52 +0000 (16:17 +1000)
commit316f60a120a8f1dacb574f705d5faf7eac3e6e2a
tree19a50e89792e5214a22d77ade945790b19370b49
parent4a445f291ac3faa08f56eaeb6e44856b6b72b74c
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>
drivers/gpu/drm/nouveau/nouveau_mem.c