diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/therm_gv11b.c | 25 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/therm_gv11b.h | 19 |
4 files changed, 6 insertions, 47 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 4b0aa321..1d2feba4 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -15,7 +15,6 @@ nvgpu-y += \ | |||
15 | $(nvgpu-t19x)/gv11b/ce_gv11b.o \ | 15 | $(nvgpu-t19x)/gv11b/ce_gv11b.o \ |
16 | $(nvgpu-t19x)/gv11b/gr_ctx_gv11b.o \ | 16 | $(nvgpu-t19x)/gv11b/gr_ctx_gv11b.o \ |
17 | $(nvgpu-t19x)/gv11b/pmu_gv11b.o \ | 17 | $(nvgpu-t19x)/gv11b/pmu_gv11b.o \ |
18 | $(nvgpu-t19x)/gv11b/therm_gv11b.o \ | ||
19 | $(nvgpu-t19x)/gv11b/subctx_gv11b.o \ | 18 | $(nvgpu-t19x)/gv11b/subctx_gv11b.o \ |
20 | $(nvgpu-t19x)/gv11b/regops_gv11b.o | 19 | $(nvgpu-t19x)/gv11b/regops_gv11b.o |
21 | 20 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 04712409..f6121f94 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include "gm20b/fifo_gm20b.h" | 35 | #include "gm20b/fifo_gm20b.h" |
36 | 36 | ||
37 | #include "gp10b/ltc_gp10b.h" | 37 | #include "gp10b/ltc_gp10b.h" |
38 | #include "gp10b/therm_gp10b.h" | ||
38 | #include "gp10b/mc_gp10b.h" | 39 | #include "gp10b/mc_gp10b.h" |
39 | #include "gp10b/ce_gp10b.h" | 40 | #include "gp10b/ce_gp10b.h" |
40 | #include "gp10b/priv_ring_gp10b.h" | 41 | #include "gp10b/priv_ring_gp10b.h" |
@@ -50,7 +51,6 @@ | |||
50 | #include "gr_ctx_gv11b.h" | 51 | #include "gr_ctx_gv11b.h" |
51 | #include "mm_gv11b.h" | 52 | #include "mm_gv11b.h" |
52 | #include "pmu_gv11b.h" | 53 | #include "pmu_gv11b.h" |
53 | #include "therm_gv11b.h" | ||
54 | #include "fb_gv11b.h" | 54 | #include "fb_gv11b.h" |
55 | #include "fifo_gv11b.h" | 55 | #include "fifo_gv11b.h" |
56 | #include "gv11b_gating_reglist.h" | 56 | #include "gv11b_gating_reglist.h" |
@@ -306,6 +306,10 @@ static const struct gpu_ops gv11b_ops = { | |||
306 | .max_entries = gk20a_gr_max_entries, | 306 | .max_entries = gk20a_gr_max_entries, |
307 | }, | 307 | }, |
308 | #endif /* CONFIG_GK20A_CTXSW_TRACE */ | 308 | #endif /* CONFIG_GK20A_CTXSW_TRACE */ |
309 | .therm = { | ||
310 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, | ||
311 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, | ||
312 | }, | ||
309 | .mc = { | 313 | .mc = { |
310 | .intr_enable = mc_gv11b_intr_enable, | 314 | .intr_enable = mc_gv11b_intr_enable, |
311 | .intr_unit_config = mc_gp10b_intr_unit_config, | 315 | .intr_unit_config = mc_gp10b_intr_unit_config, |
@@ -375,6 +379,7 @@ int gv11b_init_hal(struct gk20a *g) | |||
375 | gops->fifo = gv11b_ops.fifo; | 379 | gops->fifo = gv11b_ops.fifo; |
376 | gops->gr_ctx = gv11b_ops.gr_ctx; | 380 | gops->gr_ctx = gv11b_ops.gr_ctx; |
377 | gops->fecs_trace = gv11b_ops.fecs_trace; | 381 | gops->fecs_trace = gv11b_ops.fecs_trace; |
382 | gops->therm = gv11b_ops.therm; | ||
378 | gops->mc = gv11b_ops.mc; | 383 | gops->mc = gv11b_ops.mc; |
379 | gops->debug = gv11b_ops.debug; | 384 | gops->debug = gv11b_ops.debug; |
380 | gops->dbg_session_ops = gv11b_ops.dbg_session_ops; | 385 | gops->dbg_session_ops = gv11b_ops.dbg_session_ops; |
@@ -400,7 +405,6 @@ int gv11b_init_hal(struct gk20a *g) | |||
400 | gv11b_init_mm(gops); | 405 | gv11b_init_mm(gops); |
401 | gv11b_init_pmu_ops(g); | 406 | gv11b_init_pmu_ops(g); |
402 | gv11b_init_regops(gops); | 407 | gv11b_init_regops(gops); |
403 | gv11b_init_therm_ops(gops); | ||
404 | 408 | ||
405 | g->name = "gv11b"; | 409 | g->name = "gv11b"; |
406 | 410 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c deleted file mode 100644 index 89520ead..00000000 --- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /* | ||
2 | * GV11B Therm | ||
3 | * | ||
4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms and conditions of the GNU General Public License, | ||
8 | * version 2, as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
13 | * more details. | ||
14 | */ | ||
15 | |||
16 | #include "gk20a/gk20a.h" | ||
17 | |||
18 | #include "gp10b/therm_gp10b.h" | ||
19 | |||
20 | #include "therm_gv11b.h" | ||
21 | |||
22 | void gv11b_init_therm_ops(struct gpu_ops *gops) | ||
23 | { | ||
24 | gp10b_init_therm_ops(gops); | ||
25 | } | ||
diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.h b/drivers/gpu/nvgpu/gv11b/therm_gv11b.h deleted file mode 100644 index 2710285a..00000000 --- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | */ | ||
13 | #ifndef THERM_GV11B_H | ||
14 | #define THERM_GV11B_H | ||
15 | |||
16 | struct gpu_ops; | ||
17 | void gv11b_init_therm_ops(struct gpu_ops *gops); | ||
18 | |||
19 | #endif /* THERM_GV11B_H */ | ||