blob: 8e92bf184d24af1c658359e615bd5a7880b38769 (
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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From 3ae35c3f828f73a6b7fda7e473430e088a7f775b Mon Sep 17 00:00:00 2001
From: Amber Lin <Amber.Lin@amd.com>
Date: Mon, 25 Jul 2016 10:09:20 -0400
Subject: [PATCH 1482/4131] drm/amdgpu: Polaris10/11 support in KFD interface
Add Polaris10 and Polaris11 to amdgpu-amdkfd interface
Change-Id: I464618fd352af44880333ec472e18483387584e1
Signed-off-by: Amber Lin <Amber.Lin@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 ++
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 ++++-
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 9e0ddbb..0bf1fb3 100755
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -73,6 +73,8 @@ bool amdgpu_amdkfd_load_interface(struct amdgpu_device *adev)
case CHIP_CARRIZO:
case CHIP_TONGA:
case CHIP_FIJI:
+ case CHIP_POLARIS10:
+ case CHIP_POLARIS11:
kfd2kgd = amdgpu_amdkfd_gfx_8_0_get_functions();
break;
default:
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index b1e1598..34072aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -319,7 +319,10 @@ static int __alloc_memory_of_gpu(struct kgd_dev *kgd, uint64_t va,
adev = get_amdgpu_device(kgd);
byte_align = (adev->family == AMDGPU_FAMILY_VI &&
- adev->asic_type != CHIP_FIJI) ? VI_BO_SIZE_ALIGN : 1;
+ adev->asic_type != CHIP_FIJI &&
+ adev->asic_type != CHIP_POLARIS10 &&
+ adev->asic_type != CHIP_POLARIS11) ?
+ VI_BO_SIZE_ALIGN : 1;
*mem = kzalloc(sizeof(struct kgd_mem), GFP_KERNEL);
if (*mem == NULL) {
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 50e8533..9a0a795 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -7001,6 +7001,8 @@ static void gfx_v8_0_get_cu_info(struct amdgpu_device *adev)
switch (adev->asic_type) {
case CHIP_TONGA:
case CHIP_CARRIZO:
+ case CHIP_POLARIS10:
+ case CHIP_POLARIS11:
cu_info->max_waves_per_simd = 10;
cu_info->max_scratch_slots_per_cu = 32;
cu_info->wave_front_size = 64;
--
2.7.4
|
