This is a note to let you know that I've just added the patch titled drm/radeon: don't reset dma on NI/SI init 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-don-t-reset-dma-on-ni-si-init.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 31a25e2caf9367365fcb0e57fd8fa5a42e9b73e4 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@xxxxxxx> Date: Wed, 17 Sep 2014 17:41:04 -0400 Subject: drm/radeon: don't reset dma on NI/SI init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Alex Deucher <alexander.deucher@xxxxxxx> commit 31a25e2caf9367365fcb0e57fd8fa5a42e9b73e4 upstream. Otherwise we may lose the DMA golden settings which can lead to hangs, etc. bug: https://www.libreoffice.org/bugzilla/show_bug.cgi?id=83500 Reviewed-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/ni_dma.c | 6 ------ 1 file changed, 6 deletions(-) --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -191,12 +191,6 @@ int cayman_dma_resume(struct radeon_devi u32 reg_offset, wb_offset; int i, r; - /* Reset dma */ - WREG32(SRBM_SOFT_RESET, SOFT_RESET_DMA | SOFT_RESET_DMA1); - RREG32(SRBM_SOFT_RESET); - udelay(50); - WREG32(SRBM_SOFT_RESET, 0); - for (i = 0; i < 2; i++) { if (i == 0) { ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; 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