This is a note to let you know that I've just added the patch titled
drm/radeon/cik: use a separate counter for CP init timeout
to the 3.14-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:
drm-radeon-cik-use-a-separate-counter-for-cp-init-timeout.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 370ce45b5986118fa496dddbcd7039e1aa1a418f Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Tue, 23 Sep 2014 10:20:13 -0400
Subject: drm/radeon/cik: use a separate counter for CP init timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 370ce45b5986118fa496dddbcd7039e1aa1a418f upstream.
Otherwise we may fail to init the second compute ring.
Noticed-by: Christian König <christian.koenig@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/cik.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4392,7 +4392,7 @@ struct bonaire_mqd
*/
static int cik_cp_compute_resume(struct radeon_device *rdev)
{
- int r, i, idx;
+ int r, i, j, idx;
u32 tmp;
bool use_doorbell = true;
u64 hqd_gpu_addr;
@@ -4511,7 +4511,7 @@ static int cik_cp_compute_resume(struct
mqd->queue_state.cp_hqd_pq_wptr= 0;
if (RREG32(CP_HQD_ACTIVE) & 1) {
WREG32(CP_HQD_DEQUEUE_REQUEST, 1);
- for (i = 0; i < rdev->usec_timeout; i++) {
+ for (j = 0; j < rdev->usec_timeout; j++) {
if (!(RREG32(CP_HQD_ACTIVE) & 1))
break;
udelay(1);
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.14/drm-radeon-tweak-accel_working2-query-for-hawaii.patch
queue-3.14/drm-radeon-atom-add-new-voltage-fetch-function-for-hawaii.patch
queue-3.14/drm-radeon-don-t-reset-dma-on-ni-si-init.patch
queue-3.14/drm-radeon-don-t-reset-sdma-on-cik-init.patch
queue-3.14/drm-radeon-enable-bapm-by-default-on-desktop-tn-rl-boards.patch
queue-3.14/drm-radeon-fix-pm-handling-in-radeon_gpu_reset.patch
queue-3.14/drm-radeon-fix-semaphore-value-init.patch
queue-3.14/drm-radeon-add-missing-lines-to-ci_set_thermal_temperature_range.patch
queue-3.14/drm-radeon-dpm-handle-voltage-info-fetching-on-hawaii.patch
queue-3.14/drm-radeon-re-enable-dpm-by-default-on-btc.patch
queue-3.14/drm-radeon-tn-only-enable-bapm-on-msi-systems.patch
queue-3.14/drm-radeon-re-enable-dpm-by-default-on-cayman.patch
queue-3.14/drm-radeon-set-vm-base-addr-using-the-pfp-v2.patch
queue-3.14/drm-radeon-add-connector-quirk-for-fujitsu-board.patch
queue-3.14/drm-radeon-add-ability-to-get-and-change-dpm-state-when-radeon-px-card-is-turned-off.patch
queue-3.14/drm-radeon-cik-use-a-separate-counter-for-cp-init-timeout.patch
queue-3.14/drm-radeon-load-the-lm63-driver-for-an-lm64-thermal-chip.patch
queue-3.14/drm-radeon-dpm-set-the-thermal-type-properly-for-special-configs.patch
queue-3.14/drm-radeon-don-t-reset-dma-on-r6xx-evergreen-init.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