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/radeon_ring.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/radeon_ring.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 674aabac2212..087383408a8f 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
@@ -129,6 +129,12 @@ int radeon_ib_pool_init(struct radeon_device *rdev) | |||
129 | if (r) { | 129 | if (r) { |
130 | return r; | 130 | return r; |
131 | } | 131 | } |
132 | |||
133 | r = radeon_sa_bo_manager_start(rdev, &rdev->ring_tmp_bo); | ||
134 | if (r) { | ||
135 | return r; | ||
136 | } | ||
137 | |||
132 | rdev->ib_pool_ready = true; | 138 | rdev->ib_pool_ready = true; |
133 | if (radeon_debugfs_sa_init(rdev)) { | 139 | if (radeon_debugfs_sa_init(rdev)) { |
134 | dev_err(rdev->dev, "failed to register debugfs file for SA\n"); | 140 | dev_err(rdev->dev, "failed to register debugfs file for SA\n"); |
@@ -139,21 +145,12 @@ int radeon_ib_pool_init(struct radeon_device *rdev) | |||
139 | void radeon_ib_pool_fini(struct radeon_device *rdev) | 145 | void radeon_ib_pool_fini(struct radeon_device *rdev) |
140 | { | 146 | { |
141 | if (rdev->ib_pool_ready) { | 147 | if (rdev->ib_pool_ready) { |
148 | radeon_sa_bo_manager_suspend(rdev, &rdev->ring_tmp_bo); | ||
142 | radeon_sa_bo_manager_fini(rdev, &rdev->ring_tmp_bo); | 149 | radeon_sa_bo_manager_fini(rdev, &rdev->ring_tmp_bo); |
143 | rdev->ib_pool_ready = false; | 150 | rdev->ib_pool_ready = false; |
144 | } | 151 | } |
145 | } | 152 | } |
146 | 153 | ||
147 | int radeon_ib_pool_start(struct radeon_device *rdev) | ||
148 | { | ||
149 | return radeon_sa_bo_manager_start(rdev, &rdev->ring_tmp_bo); | ||
150 | } | ||
151 | |||
152 | int radeon_ib_pool_suspend(struct radeon_device *rdev) | ||
153 | { | ||
154 | return radeon_sa_bo_manager_suspend(rdev, &rdev->ring_tmp_bo); | ||
155 | } | ||
156 | |||
157 | int radeon_ib_ring_tests(struct radeon_device *rdev) | 154 | int radeon_ib_ring_tests(struct radeon_device *rdev) |
158 | { | 155 | { |
159 | unsigned i; | 156 | unsigned i; |