diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1915-drm-amdgpu-sdma-support-ras-gpu-reset.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1915-drm-amdgpu-sdma-support-ras-gpu-reset.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1915-drm-amdgpu-sdma-support-ras-gpu-reset.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1915-drm-amdgpu-sdma-support-ras-gpu-reset.patch new file mode 100644 index 00000000..9ebe9e1b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1915-drm-amdgpu-sdma-support-ras-gpu-reset.patch @@ -0,0 +1,46 @@ +From 4b666f9bbdd028d7a1ff20d7e7ee09eb2feddb94 Mon Sep 17 00:00:00 2001 +From: xinhui pan <xinhui.pan@amd.com> +Date: Wed, 8 May 2019 22:38:37 +0800 +Subject: [PATCH 1915/2940] drm/amdgpu: sdma support ras gpu reset + +request a gpu reset if ras return EAGAIN. +we will run late init again so it is ok to do nothing this time. + +Signed-off-by: xinhui pan <xinhui.pan@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 4a10e91339f4..c139e8db8d95 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -1533,8 +1533,14 @@ static int sdma_v4_0_late_init(void *handle) + **ras_if = ras_block; + + r = amdgpu_ras_feature_enable_on_boot(adev, *ras_if, 1); +- if (r) ++ if (r) { ++ if (r == -EAGAIN) { ++ amdgpu_ras_request_reset_on_boot(adev, ++ AMDGPU_RAS_BLOCK__SDMA); ++ r = 0; ++ } + goto feature; ++ } + + ih_info.head = **ras_if; + fs_info.head = **ras_if; +@@ -1573,7 +1579,7 @@ static int sdma_v4_0_late_init(void *handle) + feature: + kfree(*ras_if); + *ras_if = NULL; +- return -EINVAL; ++ return r; + } + + static int sdma_v4_0_sw_init(void *handle) +-- +2.17.1 + |