diff options
author | Christian König <deathsimple@vodafone.de> | 2012-07-05 05:55:34 -0400 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2012-07-17 04:32:41 -0400 |
commit | 2898c348e5caa50b31b9113726dfa45b2dfc3124 (patch) | |
tree | bc5ba4341cdc609899f28279834b3a65c9d98ecd /drivers/gpu/drm/radeon/r520.c | |
parent | b90ca986a41b233c2fcc8c809ee4f970d2de075e (diff) |
drm/radeon: remove ip_pool start/suspend
The IB pool is in gart memory, so it is completely
superfluous to unpin / repin it on suspend / resume.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r520.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r520.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index b5cf8375cd25..6df3e51acb9f 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c | |||
@@ -203,9 +203,11 @@ static int r520_startup(struct radeon_device *rdev) | |||
203 | return r; | 203 | return r; |
204 | } | 204 | } |
205 | 205 | ||
206 | r = radeon_ib_pool_start(rdev); | 206 | r = radeon_ib_pool_init(rdev); |
207 | if (r) | 207 | if (r) { |
208 | dev_err(rdev->dev, "IB initialization failed (%d).\n", r); | ||
208 | return r; | 209 | return r; |
210 | } | ||
209 | 211 | ||
210 | r = radeon_ib_ring_tests(rdev); | 212 | r = radeon_ib_ring_tests(rdev); |
211 | if (r) | 213 | if (r) |
@@ -311,20 +313,14 @@ int r520_init(struct radeon_device *rdev) | |||
311 | return r; | 313 | return r; |
312 | rv515_set_safe_registers(rdev); | 314 | rv515_set_safe_registers(rdev); |
313 | 315 | ||
314 | r = radeon_ib_pool_init(rdev); | ||
315 | rdev->accel_working = true; | 316 | rdev->accel_working = true; |
316 | if (r) { | ||
317 | dev_err(rdev->dev, "IB initialization failed (%d).\n", r); | ||
318 | rdev->accel_working = false; | ||
319 | } | ||
320 | |||
321 | r = r520_startup(rdev); | 317 | r = r520_startup(rdev); |
322 | if (r) { | 318 | if (r) { |
323 | /* Somethings want wront with the accel init stop accel */ | 319 | /* Somethings want wront with the accel init stop accel */ |
324 | dev_err(rdev->dev, "Disabling GPU acceleration\n"); | 320 | dev_err(rdev->dev, "Disabling GPU acceleration\n"); |
325 | r100_cp_fini(rdev); | 321 | r100_cp_fini(rdev); |
326 | radeon_wb_fini(rdev); | 322 | radeon_wb_fini(rdev); |
327 | r100_ib_fini(rdev); | 323 | radeon_ib_pool_fini(rdev); |
328 | radeon_irq_kms_fini(rdev); | 324 | radeon_irq_kms_fini(rdev); |
329 | rv370_pcie_gart_fini(rdev); | 325 | rv370_pcie_gart_fini(rdev); |
330 | radeon_agp_fini(rdev); | 326 | radeon_agp_fini(rdev); |