aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_agp.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-11-05 15:39:10 +1000
committerDave Airlie <airlied@redhat.com>2009-11-24 13:01:47 +1000
commit0ebf17174b4bdd99ab81c476714c91ee335fdcbf (patch)
tree7c9a5f73831bd1da7dc12af347335a41dc4b48bc /drivers/gpu/drm/radeon/radeon_agp.c
parentMerge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux (diff)
downloadlinux-dev-0ebf17174b4bdd99ab81c476714c91ee335fdcbf.tar.xz
linux-dev-0ebf17174b4bdd99ab81c476714c91ee335fdcbf.zip
drm/radeon/kms: resume AGP by calling init.
AGP resume was broken since we moved to the new init path, because we never re-enabled AGP on these systems at resume time. This patch just calls the AGP resume call which just does the reinit at resume time like the old path did. Since AGP is pretty much gpu independant I did it outside the gpu specific code. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_agp.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_agp.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c
index 23ea9955ac59..54bf49a6d676 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c
@@ -237,6 +237,18 @@ int radeon_agp_init(struct radeon_device *rdev)
#endif
}
+void radeon_agp_resume(struct radeon_device *rdev)
+{
+#if __OS_HAS_AGP
+ int r;
+ if (rdev->flags & RADEON_IS_AGP) {
+ r = radeon_agp_init(rdev);
+ if (r)
+ dev_warn(rdev->dev, "radeon AGP reinit failed\n");
+ }
+#endif
+}
+
void radeon_agp_fini(struct radeon_device *rdev)
{
#if __OS_HAS_AGP