diff options
author | Christian König <christian.koenig@amd.com> | 2013-11-12 12:58:05 +0100 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-11-15 15:56:09 -0500 |
commit | 1654b817d8f5f1c27ebc98773fe0e517b0ba2f1e (patch) | |
tree | b12139b37c3d712973baabfd5f8142728e36ef2a /drivers/gpu/drm/radeon/r100.c | |
parent | bd80c8ba995c1dbdddee14acc55c541c499e0442 (diff) | |
download | linux-1654b817d8f5f1c27ebc98773fe0e517b0ba2f1e.tar.bz2 |
drm/radeon: allow semaphore emission to fail
To workaround bugs and/or certain limits it's sometimes
useful to fall back to waiting on fences.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 784983d78158..10abc4d5a6cc 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -869,13 +869,14 @@ void r100_fence_ring_emit(struct radeon_device *rdev, radeon_ring_write(ring, RADEON_SW_INT_FIRE); } -void r100_semaphore_ring_emit(struct radeon_device *rdev, +bool r100_semaphore_ring_emit(struct radeon_device *rdev, struct radeon_ring *ring, struct radeon_semaphore *semaphore, bool emit_wait) { /* Unused on older asics, since we don't have semaphores or multiple rings */ BUG(); + return false; } int r100_copy_blit(struct radeon_device *rdev, |