tree 19a50e89792e5214a22d77ade945790b19370b49
parent 4a445f291ac3faa08f56eaeb6e44856b6b72b74c
author Francisco Jerez <currojerez@riseup.net> 1282832029 +0200
committer Ben Skeggs <bskeggs@redhat.com> 1285309072 +1000

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>