diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0997-drm-amdgpu-fix-NULL-in-vm_grab_id-while-S3-back.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0997-drm-amdgpu-fix-NULL-in-vm_grab_id-while-S3-back.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0997-drm-amdgpu-fix-NULL-in-vm_grab_id-while-S3-back.patch b/common/recipes-kernel/linux/files/0997-drm-amdgpu-fix-NULL-in-vm_grab_id-while-S3-back.patch new file mode 100644 index 00000000..7bedadd1 --- /dev/null +++ b/common/recipes-kernel/linux/files/0997-drm-amdgpu-fix-NULL-in-vm_grab_id-while-S3-back.patch @@ -0,0 +1,42 @@ +From 9e274a9d968ceed25445725f4f49f817617f5041 Mon Sep 17 00:00:00 2001 +From: Chunming Zhou <David1.Zhou@amd.com> +Date: Tue, 29 Dec 2015 11:57:38 +0800 +Subject: [PATCH 0997/1050] drm/amdgpu: fix NULL in vm_grab_id while S3 back + +vm_manager_fini shouldn't be in suspend phase. + +Change-Id: Ib5d7d3c2274cd06d41734e7de742d1a51559937a +Signed-off-by: Chunming Zhou <David1.Zhou@amd.com> +Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +index dababe4..3f95606 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +@@ -1016,7 +1016,6 @@ static int gmc_v7_0_suspend(void *handle) + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + if (adev->vm_manager.enabled) { +- amdgpu_vm_manager_fini(adev); + gmc_v7_0_vm_fini(adev); + adev->vm_manager.enabled = false; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +index adc25f8..c0c9a01 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +@@ -1037,7 +1037,6 @@ static int gmc_v8_0_suspend(void *handle) + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + if (adev->vm_manager.enabled) { +- amdgpu_vm_manager_fini(adev); + gmc_v8_0_vm_fini(adev); + adev->vm_manager.enabled = false; + } +-- +1.9.1 + |