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 ad88720335d584d99d1f2b4385b956e2f65c2d3b Mon Sep 17 00:00:00 2001
From: Chaudhary Amit Kumar <chaudharyamit.kumar@amd.com>
Date: Thu, 18 Oct 2018 19:07:16 +0530
Subject: [PATCH 1408/4131] drm/amdgpu: Remove amdgpu_powerplay references
Powerplay is no longer optional, so remove references to the
amdgpu_powerplay variable, and the conditions that it was used in
Change-Id: I6ab0533ad5ebe969ab97ac28367d8f3b66d5aa94
Signed-off-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Chaudhary Amit Kumar <chaudharyamit.kumar@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 359ca9b..47397b6 100755
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -382,8 +382,7 @@ void get_local_mem_info(struct kgd_dev *kgd,
mem_info->local_mem_size_public,
mem_info->local_mem_size_private);
- if (amdgpu_powerplay || adev->pm.funcs->get_mclk)
- mem_info->mem_clk_max = amdgpu_dpm_get_mclk(adev, false) / 100;
+ mem_info->mem_clk_max = amdgpu_dpm_get_mclk(adev, false) / 100;
}
uint64_t get_gpu_clock_counter(struct kgd_dev *kgd)
@@ -399,10 +398,7 @@ uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd)
{
struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
/* The sclk is in quantas of 10kHz */
- if (amdgpu_powerplay)
- return amdgpu_dpm_get_sclk(adev, false) / 100;
- else
- return adev->pm.dpm.dyn_state.max_clock_voltage_on_ac.sclk / 100;
+ return amdgpu_dpm_get_sclk(adev, false) / 100;
}
void get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info)
--
2.7.4
|
