diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4237-drm-amdgpu-bo-could-be-null-when-access-in-vm-bo-upd.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4237-drm-amdgpu-bo-could-be-null-when-access-in-vm-bo-upd.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4237-drm-amdgpu-bo-could-be-null-when-access-in-vm-bo-upd.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4237-drm-amdgpu-bo-could-be-null-when-access-in-vm-bo-upd.patch new file mode 100644 index 00000000..149670b8 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4237-drm-amdgpu-bo-could-be-null-when-access-in-vm-bo-upd.patch @@ -0,0 +1,43 @@ +From 5dc100fa2bccc72447fb01dc9d1cea7425a2f008 Mon Sep 17 00:00:00 2001 +From: Junwei Zhang <Jerry.Zhang@amd.com> +Date: Mon, 23 Apr 2018 17:21:21 +0800 +Subject: [PATCH 4237/5725] drm/amdgpu: bo could be null when access in vm bo + update + +Change-Id: Ifb19b5cb96816817f1ee99bcac3cb4ac3881a94c +Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com> +Reviewed-by: David Zhou <david1.zhou@amd.com> + +Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 125860a..af645fb 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1530,7 +1530,6 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, + uint64_t flags; + uint64_t vram_base_offset = adev->vm_manager.vram_base_offset; + struct amdgpu_device *bo_adev; +- uint32_t mem_type; + int r; + + if (clear || !bo_va->base.bo) { +@@ -1597,9 +1596,9 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, + * the evicted list so that it gets validated again on the + * next command submission. + */ +- mem_type = bo->tbo.mem.mem_type; + if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv && +- !(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type))) ++ !(bo->preferred_domains & ++ amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))) + list_add_tail(&bo_va->base.vm_status, &vm->evicted); + spin_unlock(&vm->status_lock); + +-- +2.7.4 + |