Commit 4d152646 authored by Christian König's avatar Christian König
Browse files

drm/radeon: drop non blocking allocations from sub allocator 



Not needed any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 529364e0

drivers/gpu/drm/radeon/radeon_object.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ extern int radeon_sa_bo_manager_suspend(struct radeon_device *rdev, 
extern 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);

extern void radeon_sa_bo_free(struct radeon_device *rdev,

			      struct radeon_sa_bo **sa_bo,

			      struct radeon_fence *fence);

drivers/gpu/drm/radeon/radeon_ring.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int radeon_ib_get(struct radeon_device *rdev, int ring, 
{

	int r;



	r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &ib->sa_bo, size, 256, true);

	r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &ib->sa_bo, size, 256);

	if (r) {

		dev_err(rdev->dev, "failed to get a new IB (%d)\n", r);

		return r;

drivers/gpu/drm/radeon/radeon_sa.c

+2 −5
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/radeon/radeon_semaphore.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int radeon_semaphore_create(struct radeon_device *rdev, 
		return -ENOMEM;

	}

	r = radeon_sa_bo_new(rdev, &rdev->ring_tmp_bo, &(*semaphore)->sa_bo,

			     8 * RADEON_NUM_SYNCS, 8, true);

			     8 * RADEON_NUM_SYNCS, 8);

	if (r) {

		kfree(*semaphore);

		*semaphore = NULL;