summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-11-12 12:58:06 +0100
committerAlex Deucher <alexander.deucher@amd.com>2013-11-15 15:56:16 -0500
commit99b4f25122f43210278cde17a9d100906235a074 (patch)
treeb3ee3449910db8959699bf53785d0e50a86d7bb8
parent1654b817d8f5f1c27ebc98773fe0e517b0ba2f1e (diff)
downloadop-kernel-dev-99b4f25122f43210278cde17a9d100906235a074.zip
op-kernel-dev-99b4f25122f43210278cde17a9d100906235a074.tar.gz
drm/radeon: disable CIK CP semaphores for now
Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/radeon/cik.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 811fc1b..c169897 100644
--- 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
}
/**
OpenPOWER on IntegriCloud