Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876dc9f3 authored by Christian König's avatar Christian König
Browse files

drm/radeon: remove radeon_fence_create 



It is completely unnecessary to create fences
before they are emitted, so remove it and a bunch
of checks if fences are emitted or not.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
parent 9c19415c

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ void evergreen_mc_program(struct radeon_device *rdev) 
 */

void evergreen_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)

{

	struct radeon_ring *ring = &rdev->ring[ib->fence->ring];

	struct radeon_ring *ring = &rdev->ring[ib->ring];



	/* set to DX10/11 mode */

	radeon_ring_write(ring, PACKET3(PACKET3_MODE_CONTROL, 0));

drivers/gpu/drm/radeon/ni.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ void cayman_fence_ring_emit(struct radeon_device *rdev, 


void cayman_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)

{

	struct radeon_ring *ring = &rdev->ring[ib->fence->ring];

	struct radeon_ring *ring = &rdev->ring[ib->ring];



	/* set to DX10/11 mode */

	radeon_ring_write(ring, PACKET3(PACKET3_MODE_CONTROL, 0));

drivers/gpu/drm/radeon/r100.c

+2 −2
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ int r100_copy_blit(struct radeon_device *rdev, 
		   uint64_t src_offset,

		   uint64_t dst_offset,

		   unsigned num_gpu_pages,

		   struct radeon_fence *fence)

		   struct radeon_fence **fence)

{

	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	uint32_t cur_pages;
@@ -947,7 +947,7 @@ int r100_copy_blit(struct radeon_device *rdev, 
			  RADEON_WAIT_HOST_IDLECLEAN |

			  RADEON_WAIT_DMA_GUI_IDLE);

	if (fence) {

		r = radeon_fence_emit(rdev, fence);

		r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX);

	}

	radeon_ring_unlock_commit(rdev, ring);

	return r;

drivers/gpu/drm/radeon/r200.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int r200_copy_dma(struct radeon_device *rdev, 
		  uint64_t src_offset,

		  uint64_t dst_offset,

		  unsigned num_gpu_pages,

		  struct radeon_fence *fence)

		  struct radeon_fence **fence)

{

	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	uint32_t size;
@@ -120,7 +120,7 @@ int r200_copy_dma(struct radeon_device *rdev, 
	radeon_ring_write(ring, PACKET0(RADEON_WAIT_UNTIL, 0));

	radeon_ring_write(ring, RADEON_WAIT_DMA_GUI_IDLE);

	if (fence) {

		r = radeon_fence_emit(rdev, fence);

		r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX);

	}

	radeon_ring_unlock_commit(rdev, ring);

	return r;

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -2309,7 +2309,7 @@ int r600_copy_blit(struct radeon_device *rdev, 
		   uint64_t src_offset,

		   uint64_t dst_offset,

		   unsigned num_gpu_pages,

		   struct radeon_fence *fence)

		   struct radeon_fence **fence)

{

	struct radeon_sa_bo *vb = NULL;

	int r;
@@ -2607,7 +2607,7 @@ void r600_fini(struct radeon_device *rdev) 
 */

void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)

{

	struct radeon_ring *ring = &rdev->ring[ib->fence->ring];

	struct radeon_ring *ring = &rdev->ring[ib->ring];



	/* FIXME: implement */

	radeon_ring_write(ring, PACKET3(PACKET3_INDIRECT_BUFFER, 2));