diff options
Diffstat (limited to 'drivers/gpu/nvgpu/lpwr')
-rw-r--r-- | drivers/gpu/nvgpu/lpwr/lpwr.c | 36 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/lpwr/rppg.c | 2 |
2 files changed, 14 insertions, 24 deletions
diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.c b/drivers/gpu/nvgpu/lpwr/lpwr.c index 1dc37cd2..9636891b 100644 --- a/drivers/gpu/nvgpu/lpwr/lpwr.c +++ b/drivers/gpu/nvgpu/lpwr/lpwr.c | |||
@@ -11,12 +11,13 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <nvgpu/bios.h> | ||
15 | |||
14 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
15 | #include "gk20a/pmu_gk20a.h" | 17 | #include "gk20a/pmu_gk20a.h" |
16 | #include "gp106/pmu_gp106.h" | 18 | #include "gp106/pmu_gp106.h" |
17 | #include "gm206/bios_gm206.h" | 19 | #include "gm206/bios_gm206.h" |
18 | #include "pstate/pstate.h" | 20 | #include "pstate/pstate.h" |
19 | #include "include/bios.h" | ||
20 | #include "perf/perf.h" | 21 | #include "perf/perf.h" |
21 | #include "lpwr.h" | 22 | #include "lpwr.h" |
22 | 23 | ||
@@ -30,13 +31,10 @@ static int get_lpwr_idx_table(struct gk20a *g) | |||
30 | struct nvgpu_bios_lpwr_idx_table_1x_header header = { 0 }; | 31 | struct nvgpu_bios_lpwr_idx_table_1x_header header = { 0 }; |
31 | struct nvgpu_bios_lpwr_idx_table_1x_entry entry = { 0 }; | 32 | struct nvgpu_bios_lpwr_idx_table_1x_entry entry = { 0 }; |
32 | 33 | ||
33 | if (g->ops.bios.get_perf_table_ptrs) { | 34 | lpwr_idx_table_ptr = (u32 *)nvgpu_bios_get_perf_table_ptrs(g, |
34 | lpwr_idx_table_ptr = (u32 *)g->ops.bios.get_perf_table_ptrs(g, | 35 | g->bios.perf_token, LOWPOWER_TABLE); |
35 | g->bios.perf_token, LOWPOWER_TABLE); | 36 | if (lpwr_idx_table_ptr == NULL) |
36 | if (lpwr_idx_table_ptr == NULL) | 37 | return -EINVAL; |
37 | return -EINVAL; | ||
38 | } else | ||
39 | return -EINVAL; | ||
40 | 38 | ||
41 | memcpy(&header, lpwr_idx_table_ptr, | 39 | memcpy(&header, lpwr_idx_table_ptr, |
42 | sizeof(struct nvgpu_bios_lpwr_idx_table_1x_header)); | 40 | sizeof(struct nvgpu_bios_lpwr_idx_table_1x_header)); |
@@ -75,13 +73,10 @@ static int get_lpwr_gr_table(struct gk20a *g) | |||
75 | struct nvgpu_bios_lpwr_gr_table_1x_header header = { 0 }; | 73 | struct nvgpu_bios_lpwr_gr_table_1x_header header = { 0 }; |
76 | struct nvgpu_bios_lpwr_gr_table_1x_entry entry = { 0 }; | 74 | struct nvgpu_bios_lpwr_gr_table_1x_entry entry = { 0 }; |
77 | 75 | ||
78 | if (g->ops.bios.get_perf_table_ptrs) { | 76 | lpwr_gr_table_ptr = (u32 *)nvgpu_bios_get_perf_table_ptrs(g, |
79 | lpwr_gr_table_ptr = (u32 *)g->ops.bios.get_perf_table_ptrs(g, | 77 | g->bios.perf_token, LOWPOWER_GR_TABLE); |
80 | g->bios.perf_token, LOWPOWER_GR_TABLE); | 78 | if (lpwr_gr_table_ptr == NULL) |
81 | if (lpwr_gr_table_ptr == NULL) | 79 | return -EINVAL; |
82 | return -EINVAL; | ||
83 | } else | ||
84 | return -EINVAL; | ||
85 | 80 | ||
86 | memcpy(&header, lpwr_gr_table_ptr, | 81 | memcpy(&header, lpwr_gr_table_ptr, |
87 | sizeof(struct nvgpu_bios_lpwr_gr_table_1x_header)); | 82 | sizeof(struct nvgpu_bios_lpwr_gr_table_1x_header)); |
@@ -122,13 +117,10 @@ static int get_lpwr_ms_table(struct gk20a *g) | |||
122 | struct nvgpu_bios_lpwr_ms_table_1x_header header = { 0 }; | 117 | struct nvgpu_bios_lpwr_ms_table_1x_header header = { 0 }; |
123 | struct nvgpu_bios_lpwr_ms_table_1x_entry entry = { 0 }; | 118 | struct nvgpu_bios_lpwr_ms_table_1x_entry entry = { 0 }; |
124 | 119 | ||
125 | if (g->ops.bios.get_perf_table_ptrs) { | 120 | lpwr_ms_table_ptr = (u32 *)nvgpu_bios_get_perf_table_ptrs(g, |
126 | lpwr_ms_table_ptr = (u32 *)g->ops.bios.get_perf_table_ptrs(g, | 121 | g->bios.perf_token, LOWPOWER_MS_TABLE); |
127 | g->bios.perf_token, LOWPOWER_MS_TABLE); | 122 | if (lpwr_ms_table_ptr == NULL) |
128 | if (lpwr_ms_table_ptr == NULL) | 123 | return -EINVAL; |
129 | return -EINVAL; | ||
130 | } else | ||
131 | return -EINVAL; | ||
132 | 124 | ||
133 | memcpy(&header, lpwr_ms_table_ptr, | 125 | memcpy(&header, lpwr_ms_table_ptr, |
134 | sizeof(struct nvgpu_bios_lpwr_ms_table_1x_header)); | 126 | sizeof(struct nvgpu_bios_lpwr_ms_table_1x_header)); |
diff --git a/drivers/gpu/nvgpu/lpwr/rppg.c b/drivers/gpu/nvgpu/lpwr/rppg.c index 3cc12840..e90fd7f9 100644 --- a/drivers/gpu/nvgpu/lpwr/rppg.c +++ b/drivers/gpu/nvgpu/lpwr/rppg.c | |||
@@ -16,8 +16,6 @@ | |||
16 | #include "gp106/pmu_gp106.h" | 16 | #include "gp106/pmu_gp106.h" |
17 | #include "gm206/bios_gm206.h" | 17 | #include "gm206/bios_gm206.h" |
18 | #include "pstate/pstate.h" | 18 | #include "pstate/pstate.h" |
19 | #include "include/bios.h" | ||
20 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
21 | 19 | ||
22 | static void pmu_handle_rppg_init_msg(struct gk20a *g, struct pmu_msg *msg, | 20 | static void pmu_handle_rppg_init_msg(struct gk20a *g, struct pmu_msg *msg, |
23 | void *param, u32 handle, u32 status) | 21 | void *param, u32 handle, u32 status) |