Rev 5271 | Rev 6104 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5271 | Rev 5346 | ||
|---|---|---|---|
| Line 249... | Line 249... | ||
| 249 | if ((rdev->pm.requested_clock_mode_index == rdev->pm.current_clock_mode_index) && |
249 | if ((rdev->pm.requested_clock_mode_index == rdev->pm.current_clock_mode_index) && |
| 250 | (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index)) |
250 | (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index)) |
| 251 | return; |
251 | return; |
| Line 252... | Line 252... | ||
| 252 | 252 | ||
| 253 | mutex_lock(&rdev->ddev->struct_mutex); |
253 | mutex_lock(&rdev->ddev->struct_mutex); |
| 254 | // down_write(&rdev->pm.mclk_lock); |
254 | down_write(&rdev->pm.mclk_lock); |
| Line 255... | Line 255... | ||
| 255 | mutex_lock(&rdev->ring_lock); |
255 | mutex_lock(&rdev->ring_lock); |
| 256 | 256 | ||
| 257 | /* wait for the rings to drain */ |
257 | /* wait for the rings to drain */ |
| Line 262... | Line 262... | ||
| 262 | } |
262 | } |
| 263 | r = radeon_fence_wait_empty(rdev, i); |
263 | r = radeon_fence_wait_empty(rdev, i); |
| 264 | if (r) { |
264 | if (r) { |
| 265 | /* needs a GPU reset dont reset here */ |
265 | /* needs a GPU reset dont reset here */ |
| 266 | mutex_unlock(&rdev->ring_lock); |
266 | mutex_unlock(&rdev->ring_lock); |
| 267 | // up_write(&rdev->pm.mclk_lock); |
267 | up_write(&rdev->pm.mclk_lock); |
| 268 | mutex_unlock(&rdev->ddev->struct_mutex); |
268 | mutex_unlock(&rdev->ddev->struct_mutex); |
| 269 | return; |
269 | return; |
| 270 | } |
270 | } |
| 271 | } |
271 | } |
| Line 298... | Line 298... | ||
| 298 | radeon_bandwidth_update(rdev); |
298 | radeon_bandwidth_update(rdev); |
| Line 299... | Line 299... | ||
| 299 | 299 | ||
| Line 300... | Line 300... | ||
| 300 | rdev->pm.dynpm_planned_action = DYNPM_ACTION_NONE; |
300 | rdev->pm.dynpm_planned_action = DYNPM_ACTION_NONE; |
| 301 | 301 | ||
| 302 | mutex_unlock(&rdev->ring_lock); |
302 | mutex_unlock(&rdev->ring_lock); |
| 303 | // up_write(&rdev->pm.mclk_lock); |
303 | up_write(&rdev->pm.mclk_lock); |
| Line 304... | Line 304... | ||
| 304 | mutex_unlock(&rdev->ddev->struct_mutex); |
304 | mutex_unlock(&rdev->ddev->struct_mutex); |
| 305 | } |
305 | } |
| Line 870... | Line 870... | ||
| 870 | printk("switching to power state:\n"); |
870 | printk("switching to power state:\n"); |
| 871 | radeon_dpm_print_power_state(rdev, rdev->pm.dpm.requested_ps); |
871 | radeon_dpm_print_power_state(rdev, rdev->pm.dpm.requested_ps); |
| 872 | } |
872 | } |
| Line 873... | Line 873... | ||
| 873 | 873 | ||
| 874 | mutex_lock(&rdev->ddev->struct_mutex); |
874 | mutex_lock(&rdev->ddev->struct_mutex); |
| 875 | // down_write(&rdev->pm.mclk_lock); |
875 | down_write(&rdev->pm.mclk_lock); |
| Line 876... | Line 876... | ||
| 876 | mutex_lock(&rdev->ring_lock); |
876 | mutex_lock(&rdev->ring_lock); |
| 877 | 877 | ||
| Line 918... | Line 918... | ||
| 918 | } |
918 | } |
| 919 | } |
919 | } |
| Line 920... | Line 920... | ||
| 920 | 920 | ||
| 921 | done: |
921 | done: |
| 922 | mutex_unlock(&rdev->ring_lock); |
922 | mutex_unlock(&rdev->ring_lock); |
| 923 | // up_write(&rdev->pm.mclk_lock); |
923 | up_write(&rdev->pm.mclk_lock); |
| 924 | mutex_unlock(&rdev->ddev->struct_mutex); |
924 | mutex_unlock(&rdev->ddev->struct_mutex); |
| Line 925... | Line 925... | ||
| 925 | } |
925 | } |
| 926 | 926 | ||