projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cfd72a4
)
Revert "drm/radeon: disable CIK CP semaphores for now"
author
Alex Deucher
<alexander.deucher@amd.com>
Thu, 9 Jan 2014 15:59:56 +0000
(10:59 -0500)
committer
Alex Deucher
<alexander.deucher@amd.com>
Mon, 20 Jan 2014 17:05:11 +0000
(12:05 -0500)
This reverts commit
99b4f25122f43210278cde17a9d100906235a074
.
Semaphores work fine after further review and testing.
Cc: 3.13 <stable@vger.kernel.org> # 3.13
drivers/gpu/drm/radeon/cik.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/cik.c
b/drivers/gpu/drm/radeon/cik.c
index
e7f6334
..
dc6d5f5
100644
(file)
--- 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
}
/**