diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fence.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 9ed0bb100bcb..86f4eeaeba66 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
@@ -84,7 +84,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence) | |||
84 | return 0; | 84 | return 0; |
85 | } | 85 | } |
86 | fence->seq = atomic_add_return(1, &rdev->fence_drv[fence->ring].seq); | 86 | fence->seq = atomic_add_return(1, &rdev->fence_drv[fence->ring].seq); |
87 | if (!rdev->cp.ready) | 87 | if (!rdev->cp[fence->ring].ready) |
88 | /* FIXME: cp is not running assume everythings is done right | 88 | /* FIXME: cp is not running assume everythings is done right |
89 | * away | 89 | * away |
90 | */ | 90 | */ |
@@ -269,7 +269,7 @@ retry: | |||
269 | * if we experiencing a lockup the value doesn't change | 269 | * if we experiencing a lockup the value doesn't change |
270 | */ | 270 | */ |
271 | if (seq == rdev->fence_drv[fence->ring].last_seq && | 271 | if (seq == rdev->fence_drv[fence->ring].last_seq && |
272 | radeon_gpu_is_lockup(rdev, &rdev->cp)) { | 272 | radeon_gpu_is_lockup(rdev, &rdev->cp[fence->ring])) { |
273 | /* good news we believe it's a lockup */ | 273 | /* good news we believe it's a lockup */ |
274 | printk(KERN_WARNING "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n", | 274 | printk(KERN_WARNING "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n", |
275 | fence->seq, seq); | 275 | fence->seq, seq); |