diff options
author | Dave Airlie <airlied@redhat.com> | 2009-11-05 06:39:10 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-11-24 04:01:47 +0100 |
commit | 0ebf17174b4bdd99ab81c476714c91ee335fdcbf (patch) | |
tree | 7c9a5f73831bd1da7dc12af347335a41dc4b48bc /drivers/gpu/drm/radeon/radeon_device.c | |
parent | Merge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux (diff) | |
download | linux-0ebf17174b4bdd99ab81c476714c91ee335fdcbf.tar.xz linux-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_device.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e3f9edfa40fe..41bb76fbe734 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -688,6 +688,8 @@ int radeon_resume_kms(struct drm_device *dev) return -1; } pci_set_master(dev->pdev); + /* resume AGP if in use */ + radeon_agp_resume(rdev); radeon_resume(rdev); radeon_restore_bios_scratch_regs(rdev); fb_set_suspend(rdev->fbdev_info, 0); |