diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3760-drm-amdgpu-Avoid-RAS-recovery-init-when-no-RAS-suppo.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3760-drm-amdgpu-Avoid-RAS-recovery-init-when-no-RAS-suppo.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3760-drm-amdgpu-Avoid-RAS-recovery-init-when-no-RAS-suppo.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3760-drm-amdgpu-Avoid-RAS-recovery-init-when-no-RAS-suppo.patch new file mode 100644 index 00000000..b03837e2 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3760-drm-amdgpu-Avoid-RAS-recovery-init-when-no-RAS-suppo.patch @@ -0,0 +1,37 @@ +From 74fad849d83a60abc1692d5d278668d2f0e15bf4 Mon Sep 17 00:00:00 2001 +From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Date: Fri, 6 Sep 2019 17:23:44 -0400 +Subject: [PATCH 3760/4256] drm/amdgpu: Avoid RAS recovery init when no RAS + support. + +Fixes driver load regression on APUs. + +Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +index d2437e13a085..119bedc9802a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +@@ -1494,9 +1494,14 @@ static int amdgpu_ras_release_bad_pages(struct amdgpu_device *adev) + int amdgpu_ras_recovery_init(struct amdgpu_device *adev) + { + struct amdgpu_ras *con = amdgpu_ras_get_context(adev); +- struct ras_err_handler_data **data = &con->eh_data; ++ struct ras_err_handler_data **data; + int ret; + ++ if (con) ++ data = &con->eh_data; ++ else ++ return 0; ++ + *data = kmalloc(sizeof(**data), GFP_KERNEL | __GFP_ZERO); + if (!*data) { + ret = -ENOMEM; +-- +2.17.1 + |