-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathamdgpu_extratemps-4.15.patch
367 lines (349 loc) · 14 KB
/
amdgpu_extratemps-4.15.patch
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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h linux-4.15/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
--- linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h 2018-04-25 19:26:38.410402602 +0200
@@ -268,6 +268,12 @@
#define amdgpu_dpm_get_temperature(adev) \
((adev)->powerplay.pp_funcs->get_temperature((adev)->powerplay.pp_handle))
+#define amdgpu_dpm_get_temperature_asic_max(adev) \
+ ((adev)->powerplay.pp_funcs->get_temperature_asic_max((adev)->powerplay.pp_handle))
+
+#define amdgpu_dpm_have_temperature_asic_max(adev) \
+ ((adev)->powerplay.pp_funcs->have_temperature_asic_max((adev)->powerplay.pp_handle))
+
#define amdgpu_dpm_set_fan_control_mode(adev, m) \
((adev)->powerplay.pp_funcs->set_fan_control_mode((adev)->powerplay.pp_handle, (m)))
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c linux-4.15/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
--- linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c 2018-04-25 19:26:38.418402580 +0200
@@ -795,6 +795,27 @@
return snprintf(buf, PAGE_SIZE, "%d\n", temp);
}
+static ssize_t amdgpu_hwmon_show_temp_asic_max(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct amdgpu_device *adev = dev_get_drvdata(dev);
+ struct drm_device *ddev = adev->ddev;
+ int temp;
+
+ /* Can't get temperature when the card is off */
+ if ((adev->flags & AMD_IS_PX) &&
+ (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
+ return -EINVAL;
+
+ if (!adev->powerplay.pp_funcs->get_temperature_asic_max)
+ temp = 0;
+ else
+ temp = amdgpu_dpm_get_temperature_asic_max(adev);
+
+ return snprintf(buf, PAGE_SIZE, "%d\n", temp);
+}
+
static ssize_t amdgpu_hwmon_show_temp_thresh(struct device *dev,
struct device_attribute *attr,
char *buf)
@@ -923,6 +944,7 @@
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, amdgpu_hwmon_show_temp, NULL, 0);
static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, amdgpu_hwmon_show_temp_thresh, NULL, 0);
static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, amdgpu_hwmon_show_temp_thresh, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, amdgpu_hwmon_show_temp_asic_max, NULL, 0);
static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, amdgpu_hwmon_get_pwm1, amdgpu_hwmon_set_pwm1, 0);
static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR, amdgpu_hwmon_get_pwm1_enable, amdgpu_hwmon_set_pwm1_enable, 0);
static SENSOR_DEVICE_ATTR(pwm1_min, S_IRUGO, amdgpu_hwmon_get_pwm1_min, NULL, 0);
@@ -933,6 +955,7 @@
&sensor_dev_attr_temp1_input.dev_attr.attr,
&sensor_dev_attr_temp1_crit.dev_attr.attr,
&sensor_dev_attr_temp1_crit_hyst.dev_attr.attr,
+ &sensor_dev_attr_temp2_input.dev_attr.attr,
&sensor_dev_attr_pwm1.dev_attr.attr,
&sensor_dev_attr_pwm1_enable.dev_attr.attr,
&sensor_dev_attr_pwm1_min.dev_attr.attr,
@@ -947,6 +970,11 @@
struct device *dev = kobj_to_dev(kobj);
struct amdgpu_device *adev = dev_get_drvdata(dev);
umode_t effective_mode = attr->mode;
+
+ if ((!adev->powerplay.pp_funcs->have_temperature_asic_max ||
+ !amdgpu_dpm_have_temperature_asic_max(adev)) &&
+ (attr == &sensor_dev_attr_temp2_input.dev_attr.attr))
+ return 0;
/* no skipping for powerplay */
if (adev->powerplay.cgs_device)
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/ci_dpm.c linux-4.15/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
--- linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/ci_dpm.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/amdgpu/ci_dpm.c 2018-04-25 19:26:38.418402580 +0200
@@ -6260,6 +6260,31 @@
return actual_temp;
}
+/* get temperature in millidegrees */
+static int ci_dpm_get_temp_asic_max(void *handle)
+{
+ u32 temp;
+ int actual_temp = 0;
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+ temp = (RREG32_SMC(ixCG_MULT_THERMAL_STATUS) & CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP_MASK) >>
+ CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP__SHIFT;
+
+ if (temp & 0x200)
+ actual_temp = 255;
+ else
+ actual_temp = temp & 0x1ff;
+
+ actual_temp = actual_temp * 1000;
+
+ return actual_temp;
+}
+
+static int ci_dpm_have_temp_asic_max(void *handle)
+{
+ return 1;
+}
+
static int ci_set_temperature_range(struct amdgpu_device *adev)
{
int ret;
@@ -7034,6 +7059,8 @@
const struct amd_pm_funcs ci_dpm_funcs = {
.get_temperature = &ci_dpm_get_temp,
+ .get_temperature_asic_max = &ci_dpm_get_temp_asic_max,
+ .have_temperature_asic_max = &ci_dpm_have_temp_asic_max,
.pre_set_power_state = &ci_dpm_pre_set_power_state,
.set_power_state = &ci_dpm_set_power_state,
.post_set_power_state = &ci_dpm_post_set_power_state,
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/si_dpm.c linux-4.15/drivers/gpu/drm/amd/amdgpu/si_dpm.c
--- linux-4.15-orig/drivers/gpu/drm/amd/amdgpu/si_dpm.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/amdgpu/si_dpm.c 2018-04-25 19:26:38.418402580 +0200
@@ -7884,6 +7884,31 @@
return actual_temp;
}
+static int si_dpm_get_temp_asic_max(void *handle)
+{
+ u32 temp;
+ int actual_temp = 0;
+ struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+
+ temp = (RREG32(CG_MULT_THERMAL_STATUS) & ASIC_MAX_TEMP_MASK) >>
+ ASIC_MAX_TEMP_SHIFT;
+
+ if (temp & 0x200)
+ actual_temp = 255;
+ else
+ actual_temp = temp & 0x1ff;
+
+ actual_temp = (actual_temp * 1000);
+
+ return actual_temp;
+}
+
+static int si_dpm_have_temp_asic_max(void *handle)
+{
+ return 1;
+}
+
+
static u32 si_dpm_get_sclk(void *handle, bool low)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -8056,6 +8081,8 @@
const struct amd_pm_funcs si_dpm_funcs = {
.get_temperature = &si_dpm_get_temp,
+ .get_temperature_asic_max = &si_dpm_get_temp_asic_max,
+ .have_temperature_asic_max = &si_dpm_have_temp_asic_max,
.pre_set_power_state = &si_dpm_pre_set_power_state,
.set_power_state = &si_dpm_set_power_state,
.post_set_power_state = &si_dpm_post_set_power_state,
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/include/amd_shared.h linux-4.15/drivers/gpu/drm/amd/include/amd_shared.h
--- linux-4.15-orig/drivers/gpu/drm/amd/include/amd_shared.h 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/include/amd_shared.h 2018-04-25 19:31:41.069545532 +0200
@@ -321,6 +321,9 @@
struct pp_display_clock_request *clock);
int (*get_display_mode_validation_clocks)(void *handle,
struct amd_pp_simple_clock_info *clocks);
+ // my ASIC_MAX temperature
+ int (*get_temperature_asic_max)(void *handle);
+ int (*have_temperature_asic_max)(void *handle);
};
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/amd_powerplay.c linux-4.15/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/amd_powerplay.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/amd_powerplay.c 2018-04-26 16:59:54.242828430 +0200
@@ -718,6 +718,52 @@
return ret;
}
+static int pp_dpm_get_temperature_asic_max(void *handle)
+{
+ struct pp_hwmgr *hwmgr;
+ struct pp_instance *pp_handle = (struct pp_instance *)handle;
+ int ret = 0;
+
+ ret = pp_check(pp_handle);
+
+ if (ret)
+ return ret;
+
+ hwmgr = pp_handle->hwmgr;
+
+ if (hwmgr->hwmgr_func->get_temperature_asic_max == NULL) {
+ pr_info("%s was not implemented.\n", __func__);
+ return 0;
+ }
+ mutex_lock(&pp_handle->pp_lock);
+ ret = hwmgr->hwmgr_func->get_temperature_asic_max(hwmgr);
+ mutex_unlock(&pp_handle->pp_lock);
+ return ret;
+}
+
+static int pp_dpm_have_temperature_asic_max(void *handle)
+{
+ struct pp_hwmgr *hwmgr;
+ struct pp_instance *pp_handle = (struct pp_instance *)handle;
+ int ret = 0;
+
+ ret = pp_check(pp_handle);
+
+ if (ret)
+ return 0;
+
+ hwmgr = pp_handle->hwmgr;
+
+ if (hwmgr->hwmgr_func == NULL)
+ return 0;
+
+ if (hwmgr->hwmgr_func->get_temperature_asic_max == NULL)
+ return 0;
+ // we have asic max
+ return 1;
+}
+
+
static int pp_dpm_get_pp_num_states(void *handle,
struct pp_states_info *data)
{
@@ -1148,6 +1194,8 @@
const struct amd_pm_funcs pp_dpm_funcs = {
.get_temperature = pp_dpm_get_temperature,
+ .get_temperature_asic_max = pp_dpm_get_temperature_asic_max,
+ .have_temperature_asic_max = pp_dpm_have_temperature_asic_max,
.load_firmware = pp_dpm_load_fw,
.wait_for_fw_loading_complete = pp_dpm_fw_loading_complete,
.force_performance_level = pp_dpm_force_performance_level,
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c 2018-04-25 19:28:38.518063233 +0200
@@ -4710,6 +4710,7 @@
.set_max_fan_pwm_output = smu7_set_max_fan_pwm_output,
.set_max_fan_rpm_output = smu7_set_max_fan_rpm_output,
.get_temperature = smu7_thermal_get_temperature,
+ .get_temperature_asic_max = smu7_thermal_get_temperature_asic_max,
.stop_thermal_controller = smu7_thermal_stop_thermal_controller,
.get_fan_speed_info = smu7_fan_ctrl_get_fan_speed_info,
.get_fan_speed_percent = smu7_fan_ctrl_get_fan_speed_percent,
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c 2018-04-25 19:28:38.518063233 +0200
@@ -301,6 +301,30 @@
}
/**
+* Reads the remote temperature from the SIslands thermal controller (ASIC MAX)
+*
+* @param hwmgr The address of the hardware manager.
+*/
+int smu7_thermal_get_temperature_asic_max(struct pp_hwmgr *hwmgr)
+{
+ int temp;
+
+ temp = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
+ CG_MULT_THERMAL_STATUS, ASIC_MAX_TEMP);
+
+ /* Bit 9 means the reading is lower than the lowest usable value. */
+ if (temp & 0x200)
+ temp = SMU7_THERMAL_MAXIMUM_TEMP_READING;
+ else
+ temp = temp & 0x1ff;
+
+ temp *= PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
+
+ return temp;
+}
+
+
+/**
* Set the requested temperature range for high and low alert signals
*
* @param hwmgr The address of the hardware manager.
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h 2018-04-25 19:28:38.518063233 +0200
@@ -39,6 +39,7 @@
#define FDO_PWM_MODE_STATIC_RPM 5
extern int smu7_thermal_get_temperature(struct pp_hwmgr *hwmgr);
+extern int smu7_thermal_get_temperature_asic_max(struct pp_hwmgr *hwmgr);
extern int smu7_thermal_stop_thermal_controller(struct pp_hwmgr *hwmgr);
extern int smu7_fan_ctrl_get_fan_speed_info(struct pp_hwmgr *hwmgr, struct phm_fan_speed_info *fan_speed_info);
extern int smu7_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr, uint32_t *speed);
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c 2018-04-25 19:28:38.518063233 +0200
@@ -5086,6 +5086,7 @@
vega10_notify_smc_display_config_after_ps_adjustment,
.force_dpm_level = vega10_dpm_force_dpm_level,
.get_temperature = vega10_thermal_get_temperature,
+ .get_temperature_asic_max = vega10_thermal_get_temperature_asic_max,
.stop_thermal_controller = vega10_thermal_stop_thermal_controller,
.get_fan_speed_info = vega10_fan_ctrl_get_fan_speed_info,
.get_fan_speed_percent = vega10_fan_ctrl_get_fan_speed_percent,
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c 2018-04-25 19:28:38.518063233 +0200
@@ -376,6 +376,32 @@
}
/**
+* Reads the remote temperature from ASIC MAX
+*
+* @param hwmgr The address of the hardware manager.
+*/
+int vega10_thermal_get_temperature_asic_max(struct pp_hwmgr *hwmgr)
+{
+ int temp;
+ uint32_t reg;
+
+ reg = soc15_get_register_offset(THM_HWID, 0,
+ mmCG_MULT_THERMAL_STATUS_BASE_IDX, mmCG_MULT_THERMAL_STATUS);
+
+ temp = cgs_read_register(hwmgr->device, reg);
+
+ temp = (temp & CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP_MASK) >>
+ CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP__SHIFT;
+
+ temp = temp & 0x1ff;
+
+ temp *= PP_TEMPERATURE_UNITS_PER_CENTIGRADES;
+
+ return temp;
+}
+
+
+/**
* Set the requested temperature range for high and low alert signals
*
* @param hwmgr The address of the hardware manager.
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h 2018-04-25 19:28:38.522063222 +0200
@@ -51,6 +51,7 @@
extern int vega10_thermal_get_temperature(struct pp_hwmgr *hwmgr);
+extern int vega10_thermal_get_temperature_asic_max(struct pp_hwmgr *hwmgr);
extern int vega10_thermal_stop_thermal_controller(struct pp_hwmgr *hwmgr);
extern int vega10_fan_ctrl_get_fan_speed_info(struct pp_hwmgr *hwmgr,
struct phm_fan_speed_info *fan_speed_info);
diff -rau linux-4.15-orig/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h linux-4.15/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
--- linux-4.15-orig/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h 2018-01-28 22:20:33.000000000 +0100
+++ linux-4.15/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h 2018-04-25 19:28:38.522063222 +0200
@@ -369,6 +369,8 @@
uint32_t mc_addr_low,
uint32_t mc_addr_hi,
uint32_t size);
+ // my ASIC MAX temperature
+ int (*get_temperature_asic_max)(struct pp_hwmgr *hwmgr);
};
struct pp_table_func {