projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1654b81
)
drm/radeon: disable CIK CP semaphores for now
author
Christian König
<christian.koenig@amd.com>
Tue, 12 Nov 2013 11:58:06 +0000
(12:58 +0100)
committer
Alex Deucher
<alexander.deucher@amd.com>
Fri, 15 Nov 2013 20:56:16 +0000
(15:56 -0500)
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
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 811fc1b5b4b983a2bb59b8c9bfea064d08b34fb0..c1698978a8f1a109201cfa395cebdb04902e8a32 100644
(file)
--- a/
drivers/gpu/drm/radeon/cik.c
+++ b/
drivers/gpu/drm/radeon/cik.c
@@
-3561,6
+3561,8
@@
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;
@@
-3569,6
+3571,9
@@
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
}
/**