| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.13 075/120] Revert "drm/radeon: disable CIK CP semaphores for now" | Date | Tue, 11 Feb 2014 11:05:16 -0800 |
| |
3.13-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <alexander.deucher@amd.com>
commit 7f4237c6dad7c959615b896d3c6c728c37943f4d upstream.
This reverts commit 99b4f25122f43210278cde17a9d100906235a074.
Semaphores work fine after further review and testing.
--- drivers/gpu/drm/radeon/cik.c | 5 ----- 1 file changed, 5 deletions(-)
--- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -3566,8 +3566,6 @@ bool cik_semaphore_ring_emit(struct rade struct radeon_semaphore *semaphore, bool emit_wait) { -/* TODO: figure out why semaphore cause lockups */ -#if 0 uint64_t addr = semaphore->gpu_addr; unsigned sel = emit_wait ? PACKET3_SEM_SEL_WAIT : PACKET3_SEM_SEL_SIGNAL; @@ -3576,9 +3574,6 @@ bool cik_semaphore_ring_emit(struct rade radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel); return true; -#else - return false; -#endif } /**
|