From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 26 Aug 2010 14:13:49 +0000 (+0200)
Subject: drm/nouveau: Fix suspend on some nv4x AGP cards.
X-Git-Tag: v2.6.37-rc1~92^2~25^2~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=316f60a120a8f1dacb574f705d5faf7eac3e6e2a;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed