diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 09:09:16 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 09:09:16 +0100 |
| commit | d282e4d9353b9e7971713aa9e78da716e4a1262d (patch) | |
| tree | 123aa2391841f37f4b8ae80c02eda4094e17994a /drivers/gpu/drm/radeon/r300.c | |
| parent | Merge pull request #1 from bernieplug/fbdev-next (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-d282e4d9353b9e7971713aa9e78da716e4a1262d.tar.xz linux-d282e4d9353b9e7971713aa9e78da716e4a1262d.zip | |
Merge commit 'v3.3-rc6' into fbdev-next
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 3fc0d29a5f39..6829638cca40 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -1431,6 +1431,8 @@ static int r300_startup(struct radeon_device *rdev) int r300_resume(struct radeon_device *rdev) { + int r; + /* Make sur GART are not working */ if (rdev->flags & RADEON_IS_PCIE) rv370_pcie_gart_disable(rdev); @@ -1452,7 +1454,11 @@ int r300_resume(struct radeon_device *rdev) radeon_surface_init(rdev); rdev->accel_working = true; - return r300_startup(rdev); + r = r300_startup(rdev); + if (r) { + rdev->accel_working = false; + } + return r; } int r300_suspend(struct radeon_device *rdev) |