diff options
author | Christian König <deathsimple@vodafone.de> | 2012-07-05 07:33:41 -0400 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2012-07-17 04:32:28 -0400 |
commit | d40fd3a3372945b35e22ea93a84277c23216747a (patch) | |
tree | e62bef4c396da7ee0061d4e5dab5db848990e9ee /drivers/gpu/drm/radeon | |
parent | 31be6183d53e89ff95ec7cb70aac67fa5588e0df (diff) |
drm/radeon: remove FIXME comment from chipset suspend
For a normal suspend/resume we allready wait for
the rings to be empty, and for a suspend/reasume
in case of a lockup we REALLY don't want to wait
for anything.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index f716e081c813..eb9a71a7a646 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -3137,7 +3137,6 @@ int evergreen_suspend(struct radeon_device *rdev) | |||
3137 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; | 3137 | struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX]; |
3138 | 3138 | ||
3139 | r600_audio_fini(rdev); | 3139 | r600_audio_fini(rdev); |
3140 | /* FIXME: we should wait for ring to be empty */ | ||
3141 | radeon_ib_pool_suspend(rdev); | 3140 | radeon_ib_pool_suspend(rdev); |
3142 | r600_blit_suspend(rdev); | 3141 | r600_blit_suspend(rdev); |
3143 | r700_cp_stop(rdev); | 3142 | r700_cp_stop(rdev); |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 2366be3df074..32a608270d7e 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1334,7 +1334,6 @@ int cayman_resume(struct radeon_device *rdev) | |||
1334 | int cayman_suspend(struct radeon_device *rdev) | 1334 | int cayman_suspend(struct radeon_device *rdev) |
1335 | { | 1335 | { |
1336 | r600_audio_fini(rdev); | 1336 | r600_audio_fini(rdev); |
1337 | /* FIXME: we should wait for ring to be empty */ | ||
1338 | radeon_ib_pool_suspend(rdev); | 1337 | radeon_ib_pool_suspend(rdev); |
1339 | radeon_vm_manager_suspend(rdev); | 1338 | radeon_vm_manager_suspend(rdev); |
1340 | r600_blit_suspend(rdev); | 1339 | r600_blit_suspend(rdev); |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 43d0c41922a5..de4de2dac160 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -2461,7 +2461,6 @@ int r600_suspend(struct radeon_device *rdev) | |||
2461 | r600_audio_fini(rdev); | 2461 | r600_audio_fini(rdev); |
2462 | radeon_ib_pool_suspend(rdev); | 2462 | radeon_ib_pool_suspend(rdev); |
2463 | r600_blit_suspend(rdev); | 2463 | r600_blit_suspend(rdev); |
2464 | /* FIXME: we should wait for ring to be empty */ | ||
2465 | r600_cp_stop(rdev); | 2464 | r600_cp_stop(rdev); |
2466 | rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false; | 2465 | rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false; |
2467 | r600_irq_suspend(rdev); | 2466 | r600_irq_suspend(rdev); |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index b4f51c569c36..7e230f62f0fa 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -996,7 +996,6 @@ int rv770_suspend(struct radeon_device *rdev) | |||
996 | r600_audio_fini(rdev); | 996 | r600_audio_fini(rdev); |
997 | radeon_ib_pool_suspend(rdev); | 997 | radeon_ib_pool_suspend(rdev); |
998 | r600_blit_suspend(rdev); | 998 | r600_blit_suspend(rdev); |
999 | /* FIXME: we should wait for ring to be empty */ | ||
1000 | r700_cp_stop(rdev); | 999 | r700_cp_stop(rdev); |
1001 | rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false; | 1000 | rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false; |
1002 | r600_irq_suspend(rdev); | 1001 | r600_irq_suspend(rdev); |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 34603b3c80ab..78c790fec63f 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -3807,7 +3807,6 @@ int si_resume(struct radeon_device *rdev) | |||
3807 | 3807 | ||
3808 | int si_suspend(struct radeon_device *rdev) | 3808 | int si_suspend(struct radeon_device *rdev) |
3809 | { | 3809 | { |
3810 | /* FIXME: we should wait for ring to be empty */ | ||
3811 | radeon_ib_pool_suspend(rdev); | 3810 | radeon_ib_pool_suspend(rdev); |
3812 | radeon_vm_manager_suspend(rdev); | 3811 | radeon_vm_manager_suspend(rdev); |
3813 | #if 0 | 3812 | #if 0 |