diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-01-09 10:59:56 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-01-20 12:05:11 -0500 |
| commit | 7f4237c6dad7c959615b896d3c6c728c37943f4d (patch) | |
| tree | 62078b53fa2e78d462aef9fc1288c9348640adf1 /drivers/gpu/drm/radeon/cik.c | |
| parent | cfd72a4c2089aa3938f37281a34d6eb3306d5fd8 (diff) | |
| download | linux-7f4237c6dad7c959615b896d3c6c728c37943f4d.tar.gz | |
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/gpu/drm/radeon/cik.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 5 |
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, 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 radeon_device *rdev, radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel); return true; -#else - return false; -#endif } /** |