This is a note to let you know that I've just added the patch titled
drm/radeon: fix active_cu mask on SI and CIK after re-init (v3)
to the 3.16-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-fix-active_cu-mask-on-si-and-cik-after-re-init-v3.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 52da51f0f9ea9d213adfc99223630707b26d1d38 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Tue, 19 Aug 2014 11:56:38 -0400
Subject: drm/radeon: fix active_cu mask on SI and CIK after re-init (v3)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 52da51f0f9ea9d213adfc99223630707b26d1d38 upstream.
Need to initialize the mask to 0 on init, otherwise it
keeps increasing.
bug:
https://bugzilla.kernel.org/show_bug.cgi?id=82581
v2: also fix cu count
v3: split count fix into separate patch
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Reviewed-by: Michel Dänzer <michel.daenzer@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/cik.c | 1 +
drivers/gpu/drm/radeon/si.c | 1 +
2 files changed, 2 insertions(+)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3449,6 +3449,7 @@ static void cik_gpu_init(struct radeon_d
rdev->config.cik.max_sh_per_se,
rdev->config.cik.max_backends_per_se);
+ rdev->config.cik.active_cus = 0;
for (i = 0; i < rdev->config.cik.max_shader_engines; i++) {
for (j = 0; j < rdev->config.cik.max_sh_per_se; j++) {
rdev->config.cik.active_cus +=
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3099,6 +3099,7 @@ static void si_gpu_init(struct radeon_de
rdev->config.si.max_sh_per_se,
rdev->config.si.max_cu_per_sh);
+ rdev->config.si.active_cus = 0;
for (i = 0; i < rdev->config.si.max_shader_engines; i++) {
for (j = 0; j < rdev->config.si.max_sh_per_se; j++) {
rdev->config.si.active_cus +=
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.16/drm-radeon-tweak-accel_working2-query-for-hawaii.patch
queue-3.16/drm-radeon-atom-add-new-voltage-fetch-function-for-hawaii.patch
queue-3.16/drm-radeon-don-t-reset-dma-on-ni-si-init.patch
queue-3.16/drm-radeon-dpm-fix-resume-on-mullins.patch
queue-3.16/drm-radeon-don-t-reset-sdma-on-cik-init.patch
queue-3.16/drm-radeon-fix-pm-handling-in-radeon_gpu_reset.patch
queue-3.16/drm-radeon-fix-semaphore-value-init.patch
queue-3.16/drm-radeon-add-missing-lines-to-ci_set_thermal_temperature_range.patch
queue-3.16/drm-radeon-fix-active_cu-mask-on-si-and-cik-after-re-init-v3.patch
queue-3.16/drm-radeon-dpm-handle-voltage-info-fetching-on-hawaii.patch
queue-3.16/drm-radeon-re-enable-dpm-by-default-on-btc.patch
queue-3.16/drm-radeon-properly-document-reloc-priority-mask.patch
queue-3.16/drm-radeon-handle-broken-disabled-rb-mask-gracefully-6xx-7xx-v2.patch
queue-3.16/drm-radeon-fix-active-cu-count-for-si-and-cik.patch
queue-3.16/drm-radeon-dpm-select-the-appropriate-vce-power-state-for-kv-kb-ml.patch
queue-3.16/drm-radeon-re-enable-dpm-by-default-on-cayman.patch
queue-3.16/drm-radeon-set-vm-base-addr-using-the-pfp-v2.patch
queue-3.16/drm-radeon-add-connector-quirk-for-fujitsu-board.patch
queue-3.16/drm-radeon-add-ability-to-get-and-change-dpm-state-when-radeon-px-card-is-turned-off.patch
queue-3.16/drm-radeon-cik-use-a-separate-counter-for-cp-init-timeout.patch
queue-3.16/drm-radeon-load-the-lm63-driver-for-an-lm64-thermal-chip.patch
queue-3.16/drm-radeon-dpm-set-the-thermal-type-properly-for-special-configs.patch
queue-3.16/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