diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0177-drm-amdgpu-Add-some-tweaks-to-gfx-8-soft-reset.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0177-drm-amdgpu-Add-some-tweaks-to-gfx-8-soft-reset.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0177-drm-amdgpu-Add-some-tweaks-to-gfx-8-soft-reset.patch b/common/recipes-kernel/linux/files/0177-drm-amdgpu-Add-some-tweaks-to-gfx-8-soft-reset.patch new file mode 100644 index 00000000..d0769bc8 --- /dev/null +++ b/common/recipes-kernel/linux/files/0177-drm-amdgpu-Add-some-tweaks-to-gfx-8-soft-reset.patch @@ -0,0 +1,60 @@ +From 376ba97a7dc4e999a24f0ef6843f1cd5c30a9e63 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Thu, 15 Oct 2015 10:59:16 -0400 +Subject: [PATCH 0177/1110] drm/amdgpu: Add some tweaks to gfx 8 soft reset +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +index 42b4203..ba3d11a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +@@ -4186,7 +4186,18 @@ static int gfx_v8_0_soft_reset(void *handle) + gfx_v8_0_cp_gfx_enable(adev, false); + + /* Disable MEC parsing/prefetching */ +- /* XXX todo */ ++ gfx_v8_0_cp_compute_enable(adev, false); ++ ++ if (grbm_soft_reset || srbm_soft_reset) { ++ tmp = RREG32(mmGMCON_DEBUG); ++ tmp = REG_SET_FIELD(tmp, ++ GMCON_DEBUG, GFX_STALL, 1); ++ tmp = REG_SET_FIELD(tmp, ++ GMCON_DEBUG, GFX_CLEAR, 1); ++ WREG32(mmGMCON_DEBUG, tmp); ++ ++ udelay(50); ++ } + + if (grbm_soft_reset) { + tmp = RREG32(mmGRBM_SOFT_RESET); +@@ -4215,6 +4226,16 @@ static int gfx_v8_0_soft_reset(void *handle) + WREG32(mmSRBM_SOFT_RESET, tmp); + tmp = RREG32(mmSRBM_SOFT_RESET); + } ++ ++ if (grbm_soft_reset || srbm_soft_reset) { ++ tmp = RREG32(mmGMCON_DEBUG); ++ tmp = REG_SET_FIELD(tmp, ++ GMCON_DEBUG, GFX_STALL, 0); ++ tmp = REG_SET_FIELD(tmp, ++ GMCON_DEBUG, GFX_CLEAR, 0); ++ WREG32(mmGMCON_DEBUG, tmp); ++ } ++ + /* Wait a little for things to settle down */ + udelay(50); + gfx_v8_0_print_status((void *)adev); +-- +2.7.4 + |