diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-05-02 15:11:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 09:16:01 +0100 |
| commit | 312c4a8cf29af451ad0b58a5760150e496b7ffb8 (patch) | |
| tree | d6b91a31ad9a954db50057d231470b326f78cc41 /drivers/gpu/drm/radeon/radeon_fence.c | |
| parent | 87438494152a9313ee56b8a0026ad5e6e87c5972 (diff) | |
| download | linux-312c4a8cf29af451ad0b58a5760150e496b7ffb8.tar.bz2 | |
drm/radeon: make radeon_gpu_is_lockup a per ring function
Different rings have different criteria to test
if they are stuck.
v2: rebased on current drm-next
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fence.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 4bd36a354fbe..66b222937370 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -259,7 +259,7 @@ retry: * if we experiencing a lockup the value doesn't change */ if (seq == rdev->fence_drv[fence->ring].last_seq && - radeon_gpu_is_lockup(rdev, &rdev->ring[fence->ring])) { + radeon_ring_is_lockup(rdev, fence->ring, &rdev->ring[fence->ring])) { /* good news we believe it's a lockup */ printk(KERN_WARNING "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n", fence->seq, seq); |