diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index b13c2eedc321..87cc1feee3ac 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -161,6 +161,9 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev) | |||
161 | WREG32(VM_CONTEXT0_CNTL + (i * 4), 0); | 161 | WREG32(VM_CONTEXT0_CNTL + (i * 4), 0); |
162 | 162 | ||
163 | r600_pcie_gart_tlb_flush(rdev); | 163 | r600_pcie_gart_tlb_flush(rdev); |
164 | DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n", | ||
165 | (unsigned)(rdev->mc.gtt_size >> 20), | ||
166 | (unsigned long long)rdev->gart.table_addr); | ||
164 | rdev->gart.ready = true; | 167 | rdev->gart.ready = true; |
165 | return 0; | 168 | return 0; |
166 | } | 169 | } |
@@ -1184,8 +1187,6 @@ int rv770_resume(struct radeon_device *rdev) | |||
1184 | 1187 | ||
1185 | int rv770_suspend(struct radeon_device *rdev) | 1188 | int rv770_suspend(struct radeon_device *rdev) |
1186 | { | 1189 | { |
1187 | int r; | ||
1188 | |||
1189 | r600_audio_fini(rdev); | 1190 | r600_audio_fini(rdev); |
1190 | /* FIXME: we should wait for ring to be empty */ | 1191 | /* FIXME: we should wait for ring to be empty */ |
1191 | r700_cp_stop(rdev); | 1192 | r700_cp_stop(rdev); |
@@ -1193,14 +1194,8 @@ int rv770_suspend(struct radeon_device *rdev) | |||
1193 | r600_irq_suspend(rdev); | 1194 | r600_irq_suspend(rdev); |
1194 | radeon_wb_disable(rdev); | 1195 | radeon_wb_disable(rdev); |
1195 | rv770_pcie_gart_disable(rdev); | 1196 | rv770_pcie_gart_disable(rdev); |
1196 | /* unpin shaders bo */ | 1197 | r600_blit_suspend(rdev); |
1197 | if (rdev->r600_blit.shader_obj) { | 1198 | |
1198 | r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); | ||
1199 | if (likely(r == 0)) { | ||
1200 | radeon_bo_unpin(rdev->r600_blit.shader_obj); | ||
1201 | radeon_bo_unreserve(rdev->r600_blit.shader_obj); | ||
1202 | } | ||
1203 | } | ||
1204 | return 0; | 1199 | return 0; |
1205 | } | 1200 | } |
1206 | 1201 | ||