Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon: drop non blocking allocations from sub allocator

Not needed any more.

Signed-off-by: Christian König <christian.koenig@amd.com>

+5 -8
+1 -1
drivers/gpu/drm/radeon/radeon_object.h
··· 180 180 extern int radeon_sa_bo_new(struct radeon_device *rdev, 181 181 struct radeon_sa_manager *sa_manager, 182 182 struct radeon_sa_bo **sa_bo, 183 - unsigned size, unsigned align, bool block); 183 + unsigned size, unsigned align); 184 184 extern void radeon_sa_bo_free(struct radeon_device *rdev, 185 185 struct radeon_sa_bo **sa_bo, 186 186 struct radeon_fence *fence);
+1 -1
drivers/gpu/drm/radeon/radeon_ring.c
··· 63 63 { 64 64 int r; 65 65 66 - r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &ib->sa_bo, size, 256, true); 66 + r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &ib->sa_bo, size, 256); 67 67 if (r) { 68 68 dev_err(rdev->dev, "failed to get a new IB (%d)\n", r); 69 69 return r;
+2 -5
drivers/gpu/drm/radeon/radeon_sa.c
··· 312 312 int radeon_sa_bo_new(struct radeon_device *rdev, 313 313 struct radeon_sa_manager *sa_manager, 314 314 struct radeon_sa_bo **sa_bo, 315 - unsigned size, unsigned align, bool block) 315 + unsigned size, unsigned align) 316 316 { 317 317 struct radeon_fence *fences[RADEON_NUM_RINGS]; 318 318 unsigned tries[RADEON_NUM_RINGS]; ··· 353 353 r = radeon_fence_wait_any(rdev, fences, false); 354 354 spin_lock(&sa_manager->wq.lock); 355 355 /* if we have nothing to wait for block */ 356 - if (r == -ENOENT && block) { 356 + if (r == -ENOENT) { 357 357 r = wait_event_interruptible_locked( 358 358 sa_manager->wq, 359 359 radeon_sa_event(sa_manager, size, align) 360 360 ); 361 - 362 - } else if (r == -ENOENT) { 363 - r = -ENOMEM; 364 361 } 365 362 366 363 } while (!r);
+1 -1
drivers/gpu/drm/radeon/radeon_semaphore.c
··· 42 42 return -ENOMEM; 43 43 } 44 44 r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &(*semaphore)->sa_bo, 45 - 8 * RADEON_NUM_SYNCS, 8, true); 45 + 8 * RADEON_NUM_SYNCS, 8); 46 46 if (r) { 47 47 kfree(*semaphore); 48 48 *semaphore = NULL;