diff options
| author |   Christian König <christian.koenig@amd.com> | 2014-02-20 21:48:00 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-03-03 11:26:39 +0100 |
| commit | 4d1526466296360f56f93c195848c1202b0cc10b (patch) | |
| tree | 8a029767671c5a64effa9643bc62c0ef9d1e3529 /drivers/gpu/drm/radeon/radeon_sa.c | |
| parent | drm/radeon: remove global vm lock (diff) | |
| download | linux-dev-4d1526466296360f56f93c195848c1202b0cc10b.tar.xz linux-dev-4d1526466296360f56f93c195848c1202b0cc10b.zip | |
drm/radeon: drop non blocking allocations from sub allocator
Not needed any more.
Signed-off-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_sa.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_sa.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index c0625805cdd7..adcf3e2f07da 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c @@ -312,7 +312,7 @@ static bool radeon_sa_bo_next_hole(struct radeon_sa_manager *sa_manager, int radeon_sa_bo_new(struct radeon_device *rdev, struct radeon_sa_manager *sa_manager, struct radeon_sa_bo **sa_bo, - unsigned size, unsigned align, bool block) + unsigned size, unsigned align) { struct radeon_fence *fences[RADEON_NUM_RINGS]; unsigned tries[RADEON_NUM_RINGS]; @@ -353,14 +353,11 @@ int radeon_sa_bo_new(struct radeon_device *rdev, r = radeon_fence_wait_any(rdev, fences, false); spin_lock(&sa_manager->wq.lock); /* if we have nothing to wait for block */ - if (r == -ENOENT && block) { + if (r == -ENOENT) { r = wait_event_interruptible_locked( sa_manager->wq, radeon_sa_event(sa_manager, size, align) ); - - } else if (r == -ENOENT) { - r = -ENOMEM; } } while (!r); |