diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index c05865e5521..4fc700684dc 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -876,6 +876,8 @@ static int rs600_startup(struct radeon_device *rdev) | |||
876 | 876 | ||
877 | int rs600_resume(struct radeon_device *rdev) | 877 | int rs600_resume(struct radeon_device *rdev) |
878 | { | 878 | { |
879 | int r; | ||
880 | |||
879 | /* Make sur GART are not working */ | 881 | /* Make sur GART are not working */ |
880 | rs600_gart_disable(rdev); | 882 | rs600_gart_disable(rdev); |
881 | /* Resume clock before doing reset */ | 883 | /* Resume clock before doing reset */ |
@@ -894,7 +896,11 @@ int rs600_resume(struct radeon_device *rdev) | |||
894 | radeon_surface_init(rdev); | 896 | radeon_surface_init(rdev); |
895 | 897 | ||
896 | rdev->accel_working = true; | 898 | rdev->accel_working = true; |
897 | return rs600_startup(rdev); | 899 | r = rs600_startup(rdev); |
900 | if (r) { | ||
901 | rdev->accel_working = false; | ||
902 | } | ||
903 | return r; | ||
898 | } | 904 | } |
899 | 905 | ||
900 | int rs600_suspend(struct radeon_device *rdev) | 906 | int rs600_suspend(struct radeon_device *rdev) |