diff options
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_dev.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index 4807f023..12bad36c 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c | |||
@@ -13,17 +13,19 @@ | |||
13 | 13 | ||
14 | #include <linux/sort.h> | 14 | #include <linux/sort.h> |
15 | 15 | ||
16 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
17 | #include <nvgpu/bios.h> | ||
18 | #include <nvgpu/kmem.h> | ||
19 | |||
16 | #include "gk20a/gk20a.h" | 20 | #include "gk20a/gk20a.h" |
21 | #include "gk20a/pmu_gk20a.h" | ||
22 | #include "gm206/bios_gm206.h" | ||
23 | |||
17 | #include "boardobj/boardobjgrp.h" | 24 | #include "boardobj/boardobjgrp.h" |
18 | #include "boardobj/boardobjgrp_e32.h" | 25 | #include "boardobj/boardobjgrp_e32.h" |
19 | #include "gm206/bios_gm206.h" | ||
20 | #include "ctrl/ctrlvolt.h" | 26 | #include "ctrl/ctrlvolt.h" |
21 | #include "gk20a/pmu_gk20a.h" | ||
22 | 27 | ||
23 | #include "volt.h" | 28 | #include "volt.h" |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
25 | |||
26 | #include <nvgpu/bios.h> | ||
27 | 29 | ||
28 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 | 30 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 |
29 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 | 31 | #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 |
@@ -135,7 +137,7 @@ struct voltage_device_entry *volt_dev_construct_dev_entry_pwm(struct gk20a *g, | |||
135 | struct voltage_device_pwm_entry *ptmp_entry = | 137 | struct voltage_device_pwm_entry *ptmp_entry = |
136 | (struct voltage_device_pwm_entry *)pargs; | 138 | (struct voltage_device_pwm_entry *)pargs; |
137 | 139 | ||
138 | pentry = kzalloc(sizeof(struct voltage_device_pwm_entry), GFP_KERNEL); | 140 | pentry = nvgpu_kzalloc(g, sizeof(struct voltage_device_pwm_entry)); |
139 | if (pentry == NULL) | 141 | if (pentry == NULL) |
140 | return NULL; | 142 | return NULL; |
141 | 143 | ||
@@ -200,7 +202,7 @@ static u32 volt_get_voltage_device_table_1x_psv(struct gk20a *g, | |||
200 | u8 volt_domain = 0; | 202 | u8 volt_domain = 0; |
201 | struct voltage_device_pwm_entry pwm_entry = { { 0 } }; | 203 | struct voltage_device_pwm_entry pwm_entry = { { 0 } }; |
202 | 204 | ||
203 | ptmp_dev = kzalloc(sizeof(struct voltage_device_pwm), GFP_KERNEL); | 205 | ptmp_dev = nvgpu_kzalloc(g, sizeof(struct voltage_device_pwm)); |
204 | if (ptmp_dev == NULL) | 206 | if (ptmp_dev == NULL) |
205 | return -ENOMEM; | 207 | return -ENOMEM; |
206 | 208 | ||
@@ -349,7 +351,7 @@ done: | |||
349 | if (pvolt_dev != NULL) | 351 | if (pvolt_dev != NULL) |
350 | pvolt_dev->num_entries = entry_cnt; | 352 | pvolt_dev->num_entries = entry_cnt; |
351 | 353 | ||
352 | kfree(ptmp_dev); | 354 | nvgpu_kfree(g, ptmp_dev); |
353 | return status; | 355 | return status; |
354 | } | 356 | } |
355 | 357 | ||
@@ -579,4 +581,3 @@ done: | |||
579 | gk20a_dbg_info(" done status %x", status); | 581 | gk20a_dbg_info(" done status %x", status); |
580 | return status; | 582 | return status; |
581 | } | 583 | } |
582 | |||