diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3992-drm-amdgpu-fix-merge-confilicts.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3992-drm-amdgpu-fix-merge-confilicts.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3992-drm-amdgpu-fix-merge-confilicts.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3992-drm-amdgpu-fix-merge-confilicts.patch new file mode 100644 index 00000000..673e2a2a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3992-drm-amdgpu-fix-merge-confilicts.patch @@ -0,0 +1,30 @@ +From 7ba0b4864d4399094194890374112c44ed919503 Mon Sep 17 00:00:00 2001 +From: Chunming Zhou <david1.zhou@amd.com> +Date: Wed, 4 Apr 2018 14:58:44 +0800 +Subject: [PATCH 3992/4131] drm/amdgpu: fix merge confilicts + +Change-Id: Idb1fe75be69fef0d0a8ddb05aeb9ff1f856c71cf +Signed-off-by: Chunming Zhou <david1.zhou@amd.com> +Reviewed-and-Tested-by: Rex Zhu <rex.zhu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +index 4fa7de0..d34ed61 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +@@ -413,7 +413,10 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size, + drm_gem_private_object_init(adev->ddev, &bo->gem_base, size); + INIT_LIST_HEAD(&bo->shadow_list); + INIT_LIST_HEAD(&bo->va);flags; ++ bo->preferred_domains = preferred_domains; ++ bo->allowed_domains = allowed_domains; + ++ bo->flags = flags; + #ifdef CONFIG_X86_32 + /* XXX: Write-combined CPU mappings of GTT seem broken on 32-bit + * See https://bugs.freedesktop.org/show_bug.cgi?id=84627 +-- +2.7.4 + |