This is a note to let you know that I've just added the patch titled
Revert "drm/radeon: disable CIK CP semaphores for now"
to the 3.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-drm-radeon-disable-cik-cp-semaphores-for-now.patch
and it can be found in the queue-3.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7f4237c6dad7c959615b896d3c6c728c37943f4d Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Thu, 9 Jan 2014 10:59:56 -0500
Subject: Revert "drm/radeon: disable CIK CP semaphores for now"
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 7f4237c6dad7c959615b896d3c6c728c37943f4d upstream.
This reverts commit 99b4f25122f43210278cde17a9d100906235a074.
Semaphores work fine after further review and testing.
---
drivers/gpu/drm/radeon/cik.c | 5 -----
1 file changed, 5 deletions(-)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3566,8 +3566,6 @@ bool cik_semaphore_ring_emit(struct rade
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 rade
radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel);
return true;
-#else
- return false;
-#endif
}
/**
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.13/drm-radeon-skip-colorbuffer-checking-if-color_info.format-is-set-to-invalid.patch
queue-3.13/drm-radeon-dce4-clear-bios-scratch-dpms-bit-v2.patch
queue-3.13/drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch
queue-3.13/drm-radeon-add-uvd-support-for-oland.patch
queue-3.13/drm-radeon-dce8-workaround-for-atom-blankcrtc-table.patch
queue-3.13/radeon-pm-guard-access-to-rdev-pm.power_state-array.patch
queue-3.13/drm-radeon-disable-dpm-on-btc.patch
queue-3.13/drm-radeon-set-si_notify_smc_display_change-properly.patch
queue-3.13/drm-radeon-fix-surface-sync-in-fence-on-cayman-v2.patch
queue-3.13/drm-radeon-runpm-don-t-runtime-suspend-non-px-cards.patch
queue-3.13/drm-radeon-set-the-full-cache-bit-for-fences-on-r7xx.patch
queue-3.13/drm-radeon-fix-dac-interrupt-handling-on-dce5.patch
queue-3.13/drm-radeon-disable-ss-on-dp-for-dce3.x.patch
queue-3.13/drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch
queue-3.13/revert-drm-radeon-disable-cik-cp-semaphores-for-now.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html