blob: 673e2a2a2462f94c173d19e7b64fc4bcc03c3131 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
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
|
