diff options
author | Christian König <deathsimple@vodafone.de> | 2012-05-02 09:11:24 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 04:16:40 -0400 |
commit | 8ba957b5b69dd107fa6056094416954d0b6e27c1 (patch) | |
tree | d633b744767222e4840db3cb77cb6fe07e1e5659 /drivers/gpu/drm/radeon/r300.c | |
parent | 7b9ef16bd187b7e7f43887afb393d1f89e5bee71 (diff) |
drm/radeon: remove r300_gpu_is_lockup
Since it is now identical to r100_gpu_is_lockup.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 04ec26916db4..6419a5900e67 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -377,20 +377,6 @@ void r300_gpu_init(struct radeon_device *rdev) | |||
377 | rdev->num_gb_pipes, rdev->num_z_pipes); | 377 | rdev->num_gb_pipes, rdev->num_z_pipes); |
378 | } | 378 | } |
379 | 379 | ||
380 | bool r300_gpu_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) | ||
381 | { | ||
382 | u32 rbbm_status; | ||
383 | |||
384 | rbbm_status = RREG32(R_000E40_RBBM_STATUS); | ||
385 | if (!G_000E40_GUI_ACTIVE(rbbm_status)) { | ||
386 | radeon_ring_lockup_update(ring); | ||
387 | return false; | ||
388 | } | ||
389 | /* force CP activities */ | ||
390 | radeon_ring_force_activity(rdev, ring); | ||
391 | return radeon_ring_test_lockup(rdev, ring); | ||
392 | } | ||
393 | |||
394 | int r300_asic_reset(struct radeon_device *rdev) | 380 | int r300_asic_reset(struct radeon_device *rdev) |
395 | { | 381 | { |
396 | struct r100_mc_save save; | 382 | struct r100_mc_save save; |