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/r600.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/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index de4de2dac16..9750f538cc8 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -2403,9 +2403,11 @@ int r600_startup(struct radeon_device *rdev) | |||
2403 | if (r) | 2403 | if (r) |
2404 | return r; | 2404 | return r; |
2405 | 2405 | ||
2406 | r = radeon_ib_pool_start(rdev); | 2406 | r = radeon_ib_pool_init(rdev); |
2407 | if (r) | 2407 | if (r) { |
2408 | dev_err(rdev->dev, "IB initialization failed (%d).\n", r); | ||
2408 | return r; | 2409 | return r; |
2410 | } | ||
2409 | 2411 | ||
2410 | r = radeon_ib_ring_tests(rdev); | 2412 | r = radeon_ib_ring_tests(rdev); |
2411 | if (r) | 2413 | if (r) |
@@ -2459,7 +2461,6 @@ int r600_resume(struct radeon_device *rdev) | |||
2459 | int r600_suspend(struct radeon_device *rdev) | 2461 | int r600_suspend(struct radeon_device *rdev) |
2460 | { | 2462 | { |
2461 | r600_audio_fini(rdev); | 2463 | r600_audio_fini(rdev); |
2462 | radeon_ib_pool_suspend(rdev); | ||
2463 | r600_blit_suspend(rdev); | 2464 | r600_blit_suspend(rdev); |
2464 | r600_cp_stop(rdev); | 2465 | r600_cp_stop(rdev); |
2465 | rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false; | 2466 | rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false; |
@@ -2542,20 +2543,14 @@ int r600_init(struct radeon_device *rdev) | |||
2542 | if (r) | 2543 | if (r) |
2543 | return r; | 2544 | return r; |
2544 | 2545 | ||
2545 | r = radeon_ib_pool_init(rdev); | ||
2546 | rdev->accel_working = true; | 2546 | rdev->accel_working = true; |
2547 | if (r) { | ||
2548 | dev_err(rdev->dev, "IB initialization failed (%d).\n", r); | ||
2549 | rdev->accel_working = false; | ||
2550 | } | ||
2551 | |||
2552 | r = r600_startup(rdev); | 2547 | r = r600_startup(rdev); |
2553 | if (r) { | 2548 | if (r) { |
2554 | dev_err(rdev->dev, "disabling GPU acceleration\n"); | 2549 | dev_err(rdev->dev, "disabling GPU acceleration\n"); |
2555 | r600_cp_fini(rdev); | 2550 | r600_cp_fini(rdev); |
2556 | r600_irq_fini(rdev); | 2551 | r600_irq_fini(rdev); |
2557 | radeon_wb_fini(rdev); | 2552 | radeon_wb_fini(rdev); |
2558 | r100_ib_fini(rdev); | 2553 | radeon_ib_pool_fini(rdev); |
2559 | radeon_irq_kms_fini(rdev); | 2554 | radeon_irq_kms_fini(rdev); |
2560 | r600_pcie_gart_fini(rdev); | 2555 | r600_pcie_gart_fini(rdev); |
2561 | rdev->accel_working = false; | 2556 | rdev->accel_working = false; |
@@ -2571,7 +2566,7 @@ void r600_fini(struct radeon_device *rdev) | |||
2571 | r600_cp_fini(rdev); | 2566 | r600_cp_fini(rdev); |
2572 | r600_irq_fini(rdev); | 2567 | r600_irq_fini(rdev); |
2573 | radeon_wb_fini(rdev); | 2568 | radeon_wb_fini(rdev); |
2574 | r100_ib_fini(rdev); | 2569 | radeon_ib_pool_fini(rdev); |
2575 | radeon_irq_kms_fini(rdev); | 2570 | radeon_irq_kms_fini(rdev); |
2576 | r600_pcie_gart_fini(rdev); | 2571 | r600_pcie_gart_fini(rdev); |
2577 | r600_vram_scratch_fini(rdev); | 2572 | r600_vram_scratch_fini(rdev); |