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

Commit 1654b817 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent bd80c8ba

drivers/gpu/drm/radeon/cik.c

+5 −8
Original line number Diff line number Diff line
@@ -3556,7 +3556,7 @@ void cik_fence_compute_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(ring, 0);

}



void cik_semaphore_ring_emit(struct radeon_device *rdev,

bool cik_semaphore_ring_emit(struct radeon_device *rdev,

			     struct radeon_ring *ring,

			     struct radeon_semaphore *semaphore,

			     bool emit_wait)
@@ -3567,6 +3567,8 @@ void cik_semaphore_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(ring, PACKET3(PACKET3_MEM_SEMAPHORE, 1));

	radeon_ring_write(ring, addr & 0xffffffff);

	radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel);



	return true;

}



/**
@@ -3609,13 +3611,8 @@ int cik_copy_cpdma(struct radeon_device *rdev, 
		return r;

	}



	if (radeon_fence_need_sync(*fence, ring->idx)) {

		radeon_semaphore_sync_rings(rdev, sem, (*fence)->ring,

					    ring->idx);

		radeon_fence_note_sync(*fence, ring->idx);

	} else {

		radeon_semaphore_free(rdev, &sem, NULL);

	}

	radeon_semaphore_sync_to(sem, *fence);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);



	for (i = 0; i < num_loops; i++) {

		cur_size_in_bytes = size_in_bytes;

drivers/gpu/drm/radeon/cik_sdma.c

+5 −8
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void cik_sdma_fence_ring_emit(struct radeon_device *rdev, 
 * Add a DMA semaphore packet to the ring wait on or signal

 * other rings (CIK).

 */

void cik_sdma_semaphore_ring_emit(struct radeon_device *rdev,

bool cik_sdma_semaphore_ring_emit(struct radeon_device *rdev,

				  struct radeon_ring *ring,

				  struct radeon_semaphore *semaphore,

				  bool emit_wait)
@@ -141,6 +141,8 @@ void cik_sdma_semaphore_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_SEMAPHORE, 0, extra_bits));

	radeon_ring_write(ring, addr & 0xfffffff8);

	radeon_ring_write(ring, upper_32_bits(addr) & 0xffffffff);



	return true;

}



/**
@@ -443,13 +445,8 @@ int cik_copy_dma(struct radeon_device *rdev, 
		return r;

	}



	if (radeon_fence_need_sync(*fence, ring->idx)) {

		radeon_semaphore_sync_rings(rdev, sem, (*fence)->ring,

					    ring->idx);

		radeon_fence_note_sync(*fence, ring->idx);

	} else {

		radeon_semaphore_free(rdev, &sem, NULL);

	}

	radeon_semaphore_sync_to(sem, *fence);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);



	for (i = 0; i < num_loops; i++) {

		cur_size_in_bytes = size_in_bytes;

drivers/gpu/drm/radeon/evergreen_dma.c

+2 −7
Original line number Diff line number Diff line
@@ -131,13 +131,8 @@ int evergreen_copy_dma(struct radeon_device *rdev, 
		return r;

	}



	if (radeon_fence_need_sync(*fence, ring->idx)) {

		radeon_semaphore_sync_rings(rdev, sem, (*fence)->ring,

					    ring->idx);

		radeon_fence_note_sync(*fence, ring->idx);

	} else {

		radeon_semaphore_free(rdev, &sem, NULL);

	}

	radeon_semaphore_sync_to(sem, *fence);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);



	for (i = 0; i < num_loops; i++) {

		cur_size_in_dw = size_in_dw;

drivers/gpu/drm/radeon/r100.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/radeon/r600.c

+5 −8
Original line number Diff line number Diff line
@@ -2650,7 +2650,7 @@ void r600_fence_ring_emit(struct radeon_device *rdev, 
	}

}



void r600_semaphore_ring_emit(struct radeon_device *rdev,

bool r600_semaphore_ring_emit(struct radeon_device *rdev,

			      struct radeon_ring *ring,

			      struct radeon_semaphore *semaphore,

			      bool emit_wait)
@@ -2664,6 +2664,8 @@ void r600_semaphore_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(ring, PACKET3(PACKET3_MEM_SEMAPHORE, 1));

	radeon_ring_write(ring, addr & 0xffffffff);

	radeon_ring_write(ring, (upper_32_bits(addr) & 0xff) | sel);



	return true;

}



/**
@@ -2706,13 +2708,8 @@ int r600_copy_cpdma(struct radeon_device *rdev, 
		return r;

	}



	if (radeon_fence_need_sync(*fence, ring->idx)) {

		radeon_semaphore_sync_rings(rdev, sem, (*fence)->ring,

					    ring->idx);

		radeon_fence_note_sync(*fence, ring->idx);

	} else {

		radeon_semaphore_free(rdev, &sem, NULL);

	}

	radeon_semaphore_sync_to(sem, *fence);

	radeon_semaphore_sync_rings(rdev, sem, ring->idx);



	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));

	radeon_ring_write(ring, (WAIT_UNTIL - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);