Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178869
b: refs/heads/master
c: 3655d54
h: refs/heads/master
i:
  178867: a722006
v: v3
  • Loading branch information
Darren Jenkins authored and Dave Airlie committed Jan 7, 2010
1 parent acd6dbc commit e72640e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d8a7f79246a447722bd90c2c4ba3ca068b2aa4c0
refs/heads/master: 3655d54af8dd85788c3e5088387469703a0f8f12
9 changes: 4 additions & 5 deletions trunk/drivers/gpu/drm/radeon/radeon_fence.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,15 @@ int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence)

bool radeon_fence_signaled(struct radeon_fence *fence)
{
struct radeon_device *rdev = fence->rdev;
unsigned long irq_flags;
bool signaled = false;

if (rdev->gpu_lockup) {
if (!fence)
return true;
}
if (fence == NULL) {

if (fence->rdev->gpu_lockup)
return true;
}

write_lock_irqsave(&fence->rdev->fence_drv.lock, irq_flags);
signaled = fence->signaled;
/* if we are shuting down report all fence as signaled */
Expand Down

0 comments on commit e72640e

Please sign in to comment.