aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-01-09 10:59:56 -0500
committerAlex Deucher <alexander.deucher@amd.com>2014-01-20 12:05:11 -0500
commit7f4237c6dad7c959615b896d3c6c728c37943f4d (patch)
tree62078b53fa2e78d462aef9fc1288c9348640adf1 /drivers
parentcfd72a4c2089aa3938f37281a34d6eb3306d5fd8 (diff)
Revert "drm/radeon: disable CIK CP semaphores for now"
This reverts commit 99b4f25122f43210278cde17a9d100906235a074. Semaphores work fine after further review and testing. Cc: 3.13 <stable@vger.kernel.org> # 3.13
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/cik.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index e7f6334138a1..dc6d5f58018d 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3566,8 +3566,6 @@ bool cik_semaphore_ring_emit(struct radeon_device *rdev,
3566 struct radeon_semaphore *semaphore, 3566 struct radeon_semaphore *semaphore,
3567 bool emit_wait) 3567 bool emit_wait)
3568{ 3568{
3569/* TODO: figure out why semaphore cause lockups */
3570#if 0
3571 uint64_t addr = semaphore->gpu_addr; 3569 uint64_t addr = semaphore->gpu_addr;
3572 unsigned sel = emit_wait ? PACKET3_SEM_SEL_WAIT : PACKET3_SEM_SEL_SIGNAL; 3570 unsigned sel = emit_wait ? PACKET3_SEM_SEL_WAIT : PACKET3_SEM_SEL_SIGNAL;
3573 3571
@@ -3576,9 +3574,6 @@ bool cik_semaphore_ring_emit(struct radeon_device *rdev,
3576 radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel); 3574 radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel);
3577 3575
3578 return true; 3576 return true;
3579#else
3580 return false;
3581#endif
3582} 3577}
3583 3578
3584/** 3579/**