diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2011-12-21 21:13:47 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-05 14:03:53 +0400 |
| commit | c1341e52802ab401be7addb55408e23307f9074b (patch) | |
| tree | 84319dfa10da13769fd9562eda73a8e60f069088 /drivers/gpu/drm/radeon/radeon_ring.c | |
| parent | 69e130a6a42270f94e6ee0bce34c3480a6b9da61 (diff) | |
| download | linux-c1341e52802ab401be7addb55408e23307f9074b.tar.xz | |
drm/radeon: allocate semaphore from the ib pool
This allow to share the ib pool with semaphore and avoid
having more bo around.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index bc844fe86ae6..465fb34c197b 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -77,8 +77,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v) /* * IB. */ -static bool radeon_ib_try_free(struct radeon_device *rdev, - struct radeon_ib *ib) +bool radeon_ib_try_free(struct radeon_device *rdev, struct radeon_ib *ib) { bool done = false; @@ -148,7 +147,7 @@ retry: /* this should be rare event, ie all ib scheduled none signaled yet. */ for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { - if (rdev->ib_pool.ibs[idx].fence) { + if (rdev->ib_pool.ibs[idx].fence && rdev->ib_pool.ibs[idx].fence->emitted) { r = radeon_fence_wait(rdev->ib_pool.ibs[idx].fence, false); if (!r) { goto retry; |