This is a note to let you know that I've just added the patch titled
drm/radeon/cik: properly set compute ring status on disable
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:
drm-radeon-cik-properly-set-compute-ring-status-on-disable.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 <[email protected]> know about it.
>From b2b3d8d952e4f8d6ac2ce80be96b937f29f6e42e Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 12 Mar 2014 16:20:44 -0400
Subject: drm/radeon/cik: properly set compute ring status on disable
From: Alex Deucher <[email protected]>
commit b2b3d8d952e4f8d6ac2ce80be96b937f29f6e42e upstream.
When we disable the rings, set the status properly. If
not other code pathes may try and use the rings which are
not functional at this point.
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/cik.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4069,8 +4069,11 @@ static void cik_cp_compute_enable(struct
{
if (enable)
WREG32(CP_MEC_CNTL, 0);
- else
+ else {
WREG32(CP_MEC_CNTL, (MEC_ME1_HALT | MEC_ME2_HALT));
+ rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false;
+ rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false;
+ }
udelay(50);
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.13/drm-radeon-fix-runpm-disabling-on-non-px-harder.patch
queue-3.13/drm-radeon-dpm-fix-typo-in-evergreen_smc_firmware_header_softregisters.patch
queue-3.13/drm-radeon-cik-properly-set-sdma-ring-status-on-disable.patch
queue-3.13/drm-radeon-cik-stop-the-sdma-engines-in-the-enable-function.patch
queue-3.13/drm-radeon-re-order-firmware-loading-in-preparation-for-dpm-rework.patch
queue-3.13/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch
queue-3.13/drm-radeon-ttm-must-be-init-with-cpu-visible-vram-v2.patch
queue-3.13/drm-radeon-cik-properly-set-compute-ring-status-on-disable.patch
queue-3.13/drm-radeon-fix-minor-typos-in-si_dpm.c.patch
queue-3.13/drm-radeon-si-fix-typo-in-dpm-sq-ramping-setup.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
