This is a note to let you know that I've just added the patch titled

    drm/radeon/cik: properly set sdma 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-sdma-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 7b1bbe883b3ed962ca2be4daf321f318f5091340 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 12 Mar 2014 15:15:58 -0400
Subject: drm/radeon/cik: properly set sdma ring status on disable

From: Alex Deucher <[email protected]>

commit 7b1bbe883b3ed962ca2be4daf321f318f5091340 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_sdma.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -193,6 +193,8 @@ static void cik_sdma_gfx_stop(struct rad
                WREG32(SDMA0_GFX_RB_CNTL + reg_offset, rb_cntl);
                WREG32(SDMA0_GFX_IB_CNTL + reg_offset, 0);
        }
+       rdev->ring[R600_RING_TYPE_DMA_INDEX].ready = false;
+       rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready = false;
 }
 
 /**


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

Reply via email to