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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From 15e16c601f8dac26a1656ab050652d0c37d14dc5 Mon Sep 17 00:00:00 2001
From: Kevin Wang <Kevin1.Wang@amd.com>
Date: Mon, 23 Apr 2018 10:34:33 +0800
Subject: [PATCH 4225/5725] drm/amdkcl: fix amdgpu_bo_param changed compile
error
Change-Id: Ife408c022d3bc7add402114984eefe0c7f5c2c97
Signed-off-by: Kevin Wang <Kevin1.Wang@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index b68f2b8..ffe6b05 100755
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -463,7 +463,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
else
amdgpu_cs_report_moved_bytes(adev, ctx.bytes_moved, 0);
- if (domain & AMDGPU_GEM_DOMAIN_DGMA && adev->ssg.enabled)
+ if (bp->domain & AMDGPU_GEM_DOMAIN_DGMA && adev->ssg.enabled)
bo->tbo.ssg_can_map = true;
if (bp->type == ttm_bo_type_kernel)
@@ -496,12 +496,12 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
if (bp->type == ttm_bo_type_device)
bo->flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
- if (((flags & AMDGPU_GEM_CREATE_NO_EVICT) && amdgpu_no_evict) ||
- domain & (AMDGPU_GEM_DOMAIN_DGMA | AMDGPU_GEM_DOMAIN_DGMA_IMPORT)) {
+ if (((bp->flags & AMDGPU_GEM_CREATE_NO_EVICT) && amdgpu_no_evict) ||
+ bp->domain & (AMDGPU_GEM_DOMAIN_DGMA | AMDGPU_GEM_DOMAIN_DGMA_IMPORT)) {
r = amdgpu_bo_reserve(bo, false);
if (unlikely(r != 0))
return r;
- r = amdgpu_bo_pin(bo, domain, NULL);
+ r = amdgpu_bo_pin(bo, bp->domain, NULL);
amdgpu_bo_unreserve(bo);
}
--
2.7.4
|
