summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-01-12 16:01:36 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-24 18:15:16 -0500
commit4b09997772f406d16945016ff4581c7c992faeab (patch)
tree8a638b710a01977ee49268a9b327d9488bd96558
parent4f3871309d5216b50179feed8f8024193b2224cf (diff)
nvgpu: gpu: HW header update for Volta
Similar HW header update as has been done for all the other chips. HW header files are located under: drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/ And can be included like so: #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> Bug 1799159 Change-Id: If39bd71480a34f85bf25f4c36aec0f8f6de4dc9f Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1284433 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gv11b/ce_gv11b.c7
-rw-r--r--drivers/gpu/nvgpu/gv11b/fb_gv11b.c10
-rw-r--r--drivers/gpu/nvgpu/gv11b/fecs_trace_gv11b.c1
-rw-r--r--drivers/gpu/nvgpu/gv11b/fifo_gv11b.c14
-rw-r--r--drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c1
-rw-r--r--drivers/gpu/nvgpu/gv11b/gr_gv11b.c26
-rw-r--r--drivers/gpu/nvgpu/gv11b/gv11b.c1
-rw-r--r--drivers/gpu/nvgpu/gv11b/hal_gv11b.c38
-rw-r--r--drivers/gpu/nvgpu/gv11b/ltc_gv11b.c9
-rw-r--r--drivers/gpu/nvgpu/gv11b/mc_gv11b.c9
-rw-r--r--drivers/gpu/nvgpu/gv11b/mm_gv11b.c8
-rw-r--r--drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c8
-rw-r--r--drivers/gpu/nvgpu/gv11b/pmu_gv11b.c6
-rw-r--r--drivers/gpu/nvgpu/gv11b/subctx_gv11b.c8
-rw-r--r--drivers/gpu/nvgpu/gv11b/therm_gv11b.c6
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_bus_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ce_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_ce_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_ctxsw_prog_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_flush_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_flush_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fuse_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_fuse_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_gmmu_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ltc_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_ltc_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_mc_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_perf_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pram_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_pram_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringmaster_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_pri_ringmaster_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_pri_ringstation_sys_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_proj_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_pwr_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_therm_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_therm_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_timer_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_timer_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_top_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_top_gv11b.h)0
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_usermode_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/hw_usermode_gv11b.h)0
39 files changed, 91 insertions, 61 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c
index 961054e0..efe443cc 100644
--- a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Volta GPU series Copy Engine. 2 * Volta GPU series Copy Engine.
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
@@ -16,9 +16,10 @@
16 * this program. 16 * this program.
17 */ 17 */
18 18
19#include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */ 19#include "gk20a/gk20a.h"
20#include "hw_ce_gv11b.h" 20
21#include "gp10b/ce_gp10b.h" 21#include "gp10b/ce_gp10b.h"
22
22#include "ce_gv11b.h" 23#include "ce_gv11b.h"
23 24
24void gv11b_init_ce(struct gpu_ops *gops) 25void gv11b_init_ce(struct gpu_ops *gops)
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index fb31d6a8..9588287f 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -1,8 +1,8 @@
1/* 1/*
2 * GV11B FB 2 * GV11B FB
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5* 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
8 * version 2, as published by the Free Software Foundation. 8 * version 2, as published by the Free Software Foundation.
@@ -16,11 +16,13 @@
16#include <linux/types.h> 16#include <linux/types.h>
17 17
18#include "gk20a/gk20a.h" 18#include "gk20a/gk20a.h"
19#include "gk20a/kind_gk20a.h"
20
19#include "gp10b/fb_gp10b.h" 21#include "gp10b/fb_gp10b.h"
22
20#include "gv11b/fb_gv11b.h" 23#include "gv11b/fb_gv11b.h"
21#include "gk20a/kind_gk20a.h"
22 24
23#include "hw_gmmu_gv11b.h" 25#include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h>
24 26
25static void gv11b_init_uncompressed_kind_map(void) 27static void gv11b_init_uncompressed_kind_map(void)
26{ 28{
diff --git a/drivers/gpu/nvgpu/gv11b/fecs_trace_gv11b.c b/drivers/gpu/nvgpu/gv11b/fecs_trace_gv11b.c
index f3f8b797..92357980 100644
--- a/drivers/gpu/nvgpu/gv11b/fecs_trace_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fecs_trace_gv11b.c
@@ -14,6 +14,7 @@
14 */ 14 */
15 15
16#include "gp10b/fecs_trace_gp10b.h" 16#include "gp10b/fecs_trace_gp10b.h"
17
17#include "gv11b/fecs_trace_gv11b.h" 18#include "gv11b/fecs_trace_gv11b.h"
18 19
19#ifdef CONFIG_GK20A_CTXSW_TRACE 20#ifdef CONFIG_GK20A_CTXSW_TRACE
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 7f2f5a65..ab32016e 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -14,17 +14,21 @@
14 */ 14 */
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/types.h> 16#include <linux/types.h>
17
17#include "gk20a/gk20a.h" 18#include "gk20a/gk20a.h"
18#include "gk20a/fifo_gk20a.h" 19#include "gk20a/fifo_gk20a.h"
20
19#include "gp10b/fifo_gp10b.h" 21#include "gp10b/fifo_gp10b.h"
20#include "hw_pbdma_gv11b.h" 22
23#include <nvgpu/hw/gv11b/hw_pbdma_gv11b.h>
24#include <nvgpu/hw/gv11b/hw_fifo_gv11b.h>
25#include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
26#include <nvgpu/hw/gv11b/hw_ccsr_gv11b.h>
27#include <nvgpu/hw/gv11b/hw_usermode_gv11b.h>
28
21#include "fifo_gv11b.h" 29#include "fifo_gv11b.h"
22#include "subctx_gv11b.h" 30#include "subctx_gv11b.h"
23#include "gr_gv11b.h" 31#include "gr_gv11b.h"
24#include "hw_fifo_gv11b.h"
25#include "hw_ram_gv11b.h"
26#include "hw_ccsr_gv11b.h"
27#include "hw_usermode_gv11b.h"
28 32
29#define CHANNEL_INFO_VEID0 0 33#define CHANNEL_INFO_VEID0 0
30#define PBDMA_SUBDEVICE_ID 1 34#define PBDMA_SUBDEVICE_ID 1
diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c
index 032e0c3e..6cb42baa 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c
@@ -19,6 +19,7 @@
19 */ 19 */
20 20
21#include "gk20a/gk20a.h" 21#include "gk20a/gk20a.h"
22
22#include "gr_ctx_gv11b.h" 23#include "gr_ctx_gv11b.h"
23 24
24static int gr_gv11b_get_netlist_name(struct gk20a *g, int index, char *name) 25static int gr_gv11b_get_netlist_name(struct gk20a *g, int index, char *name)
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index dfb46701..31c1a420 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -13,32 +13,34 @@
13 * more details. 13 * more details.
14 */ 14 */
15 15
16#include <linux/tegra_gpu_t19x.h>
17#include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */
18#include <linux/delay.h> 16#include <linux/delay.h>
19#include <linux/version.h> 17#include <linux/version.h>
18#include <linux/vmalloc.h>
19#include <linux/tegra_gpu_t19x.h>
20
20#include <soc/tegra/fuse.h> 21#include <soc/tegra/fuse.h>
21 22
22#include <nvgpu/timers.h> 23#include <nvgpu/timers.h>
23 24
25#include "gk20a/gk20a.h"
24#include "gk20a/gr_gk20a.h" 26#include "gk20a/gr_gk20a.h"
25#include "gk20a/semaphore_gk20a.h" 27#include "gk20a/semaphore_gk20a.h"
26#include "gk20a/dbg_gpu_gk20a.h" 28#include "gk20a/dbg_gpu_gk20a.h"
27 29
28#include "gm20b/gr_gm20b.h" 30#include "gm20b/gr_gm20b.h"
31
29#include "gv11b/gr_gv11b.h" 32#include "gv11b/gr_gv11b.h"
30#include "gv11b/mm_gv11b.h" 33#include "gv11b/mm_gv11b.h"
31#include "gv11b/subctx_gv11b.h" 34#include "gv11b/subctx_gv11b.h"
32#include "hw_gr_gv11b.h" 35
33#include "hw_fifo_gv11b.h" 36#include <nvgpu/hw/gv11b/hw_gr_gv11b.h>
34#include "hw_proj_gv11b.h" 37#include <nvgpu/hw/gv11b/hw_fifo_gv11b.h>
35#include "hw_ctxsw_prog_gv11b.h" 38#include <nvgpu/hw/gv11b/hw_proj_gv11b.h>
36#include "hw_mc_gv11b.h" 39#include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
37#include "hw_gr_gv11b.h" 40#include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
38#include "hw_ram_gv11b.h" 41#include <nvgpu/hw/gv11b/hw_gr_gv11b.h>
39#include "hw_pbdma_gv11b.h" 42#include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
40#include <linux/vmalloc.h> 43#include <nvgpu/hw/gv11b/hw_pbdma_gv11b.h>
41#include <linux/tegra_gpu_t19x.h>
42 44
43static bool gr_gv11b_is_valid_class(struct gk20a *g, u32 class_num) 45static bool gr_gv11b_is_valid_class(struct gk20a *g, u32 class_num)
44{ 46{
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.c b/drivers/gpu/nvgpu/gv11b/gv11b.c
index c1809f95..09628940 100644
--- a/drivers/gpu/nvgpu/gv11b/gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gv11b.c
@@ -17,6 +17,7 @@
17 */ 17 */
18 18
19#include "gk20a/gk20a.h" 19#include "gk20a/gk20a.h"
20
20#include "gv11b/gv11b.h" 21#include "gv11b/gv11b.h"
21 22
22int gv11b_init_gpu_characteristics(struct gk20a *g) 23int gv11b_init_gpu_characteristics(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index ccaa570c..07f386e8 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GV11B Tegra HAL interface 2 * GV11B Tegra HAL interface
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
@@ -18,26 +18,28 @@
18 18
19#include <linux/types.h> 19#include <linux/types.h>
20#include <linux/tegra_gpu_t19x.h> 20#include <linux/tegra_gpu_t19x.h>
21#include "gk20a/gk20a.h"
22 21
23#include "gv11b/hal_gv11b.h" 22#include "gk20a/gk20a.h"
24#include "gv11b/gr_gv11b.h" 23#include "gk20a/dbg_gpu_gk20a.h"
25#include "gv11b/mc_gv11b.h"
26#include "gv11b/ltc_gv11b.h"
27#include "gv11b/fecs_trace_gv11b.h"
28#include "gv11b/gv11b.h"
29#include "gv11b/ce_gv11b.h"
30#include "gv11b/gr_ctx_gv11b.h"
31#include "gv11b/mm_gv11b.h"
32#include "gv11b/pmu_gv11b.h"
33#include "gv11b/therm_gv11b.h"
34#include "gv11b/fb_gv11b.h"
35#include "gv11b/fifo_gv11b.h"
36#include "gv11b/hw_proj_gv11b.h"
37#include "gv11b/gv11b_gating_reglist.h"
38 24
39#include "gm20b/gr_gm20b.h" 25#include "gm20b/gr_gm20b.h"
40#include "gk20a/dbg_gpu_gk20a.h" 26
27#include "hal_gv11b.h"
28#include "gr_gv11b.h"
29#include "mc_gv11b.h"
30#include "ltc_gv11b.h"
31#include "fecs_trace_gv11b.h"
32#include "gv11b.h"
33#include "ce_gv11b.h"
34#include "gr_ctx_gv11b.h"
35#include "mm_gv11b.h"
36#include "pmu_gv11b.h"
37#include "therm_gv11b.h"
38#include "fb_gv11b.h"
39#include "fifo_gv11b.h"
40#include "gv11b_gating_reglist.h"
41
42#include <nvgpu/hw/gv11b/hw_proj_gv11b.h>
41 43
42static struct gpu_ops gv11b_ops; 44static struct gpu_ops gv11b_ops;
43 45
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index c0e46be3..85ff33d2 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -13,12 +13,13 @@
13 * more details. 13 * more details.
14 */ 14 */
15 15
16#include <linux/types.h>
17
18#include "gk20a/gk20a.h" 16#include "gk20a/gk20a.h"
17
19#include "gp10b/ltc_gp10b.h" 18#include "gp10b/ltc_gp10b.h"
20#include "gv11b/ltc_gv11b.h" 19
21#include "hw_ltc_gv11b.h" 20#include "ltc_gv11b.h"
21
22#include <nvgpu/hw/gv11b/hw_ltc_gv11b.h>
22 23
23/* 24/*
24 * Sets the ZBC stencil for the passed index. 25 * Sets the ZBC stencil for the passed index.
diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
index 0111d6b3..65aad786 100644
--- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GV11B master 2 * GV11B master
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
@@ -16,9 +16,12 @@
16#include <linux/types.h> 16#include <linux/types.h>
17 17
18#include "gk20a/gk20a.h" 18#include "gk20a/gk20a.h"
19
19#include "gp10b/mc_gp10b.h" 20#include "gp10b/mc_gp10b.h"
20#include "gv11b/mc_gv11b.h" 21
21#include "hw_mc_gv11b.h" 22#include "mc_gv11b.h"
23
24#include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
22 25
23static void mc_gv11b_intr_enable(struct gk20a *g) 26static void mc_gv11b_intr_enable(struct gk20a *g)
24{ 27{
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
index 7f104a6d..404ee921 100644
--- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GV11B MMU 2 * GV11B MMU
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
@@ -15,10 +15,14 @@
15 15
16#include <linux/pm_runtime.h> 16#include <linux/pm_runtime.h>
17#include <linux/dma-mapping.h> 17#include <linux/dma-mapping.h>
18
18#include "gk20a/gk20a.h" 19#include "gk20a/gk20a.h"
20
19#include "gp10b/mm_gp10b.h" 21#include "gp10b/mm_gp10b.h"
22
20#include "mm_gv11b.h" 23#include "mm_gv11b.h"
21#include "hw_fb_gv11b.h" 24
25#include <nvgpu/hw/gv11b/hw_fb_gv11b.h>
22 26
23static bool gv11b_mm_is_bar1_supported(struct gk20a *g) 27static bool gv11b_mm_is_bar1_supported(struct gk20a *g)
24{ 28{
diff --git a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c
index 1f36e59c..8fd6583e 100644
--- a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c
+++ b/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GV11B Tegra Platform Interface 2 * GV11B Tegra Platform Interface
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
@@ -18,17 +18,19 @@
18#include <linux/debugfs.h> 18#include <linux/debugfs.h>
19#include <linux/tegra-powergate.h> 19#include <linux/tegra-powergate.h>
20#include <linux/platform_data/tegra_edp.h> 20#include <linux/platform_data/tegra_edp.h>
21#include <uapi/linux/nvgpu.h>
22#include <linux/dma-buf.h> 21#include <linux/dma-buf.h>
23#include <linux/nvmap.h> 22#include <linux/nvmap.h>
24#include <linux/tegra_pm_domains.h> 23#include <linux/tegra_pm_domains.h>
25#include <linux/reset.h> 24#include <linux/reset.h>
26#include <linux/hashtable.h> 25#include <linux/hashtable.h>
26
27#include <uapi/linux/nvgpu.h>
28
27#include "gk20a/platform_gk20a.h" 29#include "gk20a/platform_gk20a.h"
28#include "gk20a/gk20a.h" 30#include "gk20a/gk20a.h"
29#include "platform_tegra.h" 31#include "platform_tegra.h"
32
30#include "gr_gv11b.h" 33#include "gr_gv11b.h"
31#include "hw_gr_gv11b.h"
32 34
33/* 35/*
34 * gv11b_tegra_get_clocks() 36 * gv11b_tegra_get_clocks()
diff --git a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
index 9ee1ed30..6b56dd21 100644
--- a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
@@ -15,12 +15,16 @@
15 15
16#include <linux/delay.h> /* for udelay */ 16#include <linux/delay.h> /* for udelay */
17#include <linux/clk.h> 17#include <linux/clk.h>
18
18#include <soc/tegra/fuse.h> 19#include <soc/tegra/fuse.h>
20
19#include "gk20a/gk20a.h" 21#include "gk20a/gk20a.h"
22
20#include "gp10b/pmu_gp10b.h" 23#include "gp10b/pmu_gp10b.h"
21 24
22#include "pmu_gv11b.h" 25#include "pmu_gv11b.h"
23#include "hw_pwr_gv11b.h" 26
27#include <nvgpu/hw/gv11b/hw_pwr_gv11b.h>
24 28
25#define ALIGN_4KB 12 29#define ALIGN_4KB 12
26 30
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index b0d0a192..02683d8b 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Volta GPU series Subcontext 2 * Volta GPU series Subcontext
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 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, 7 * under the terms and conditions of the GNU General Public License,
@@ -18,9 +18,11 @@
18 18
19#include "gk20a/gk20a.h" 19#include "gk20a/gk20a.h"
20#include "gk20a/semaphore_gk20a.h" 20#include "gk20a/semaphore_gk20a.h"
21
21#include "gv11b/subctx_gv11b.h" 22#include "gv11b/subctx_gv11b.h"
22#include "gv11b/hw_ram_gv11b.h" 23
23#include "gv11b/hw_ctxsw_prog_gv11b.h" 24#include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
25#include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
24 26
25static void gv11b_init_subcontext_pdb(struct channel_gk20a *c, 27static void gv11b_init_subcontext_pdb(struct channel_gk20a *c,
26 struct mem_desc *inst_block); 28 struct mem_desc *inst_block);
diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
index 69d2a1fe..89520ead 100644
--- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
@@ -1,8 +1,7 @@
1/* 1/*
2 *
3 * GV11B Therm 2 * GV11B Therm
4 * 3 *
5 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
6 * 5 *
7 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
8 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -15,8 +14,9 @@
15 */ 14 */
16 15
17#include "gk20a/gk20a.h" 16#include "gk20a/gk20a.h"
17
18#include "gp10b/therm_gp10b.h" 18#include "gp10b/therm_gp10b.h"
19#include "hw_therm_gv11b.h" 19
20#include "therm_gv11b.h" 20#include "therm_gv11b.h"
21 21
22void gv11b_init_therm_ops(struct gpu_ops *gops) 22void gv11b_init_therm_ops(struct gpu_ops *gops)
diff --git a/drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_bus_gv11b.h
index 66571ae7..66571ae7 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_bus_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_bus_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h
index 618c4806..618c4806 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_ccsr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ccsr_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ce_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ce_gv11b.h
index 9f279207..9f279207 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_ce_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ce_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ctxsw_prog_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h
index 228bf5f2..228bf5f2 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_ctxsw_prog_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
index d2f22afa..d2f22afa 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_fb_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h
index d68c823a..d68c823a 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_flush_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_flush_gv11b.h
index 380f8824..380f8824 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_flush_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_flush_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_fuse_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fuse_gv11b.h
index 280a048a..280a048a 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_fuse_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fuse_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_gmmu_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h
index 1c523f87..1c523f87 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_gmmu_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gmmu_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
index 656597ba..656597ba 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ltc_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ltc_gv11b.h
index 6968c699..6968c699 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_ltc_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ltc_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_mc_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h
index 98bec43a..98bec43a 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_mc_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
index c4d3a631..c4d3a631 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_pbdma_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_perf_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h
index 836c014b..836c014b 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_perf_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_perf_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_pram_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pram_gv11b.h
index da2d4d2e..da2d4d2e 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_pram_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pram_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_pri_ringmaster_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringmaster_gv11b.h
index 835366c1..835366c1 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_pri_ringmaster_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringmaster_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_pri_ringstation_sys_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h
index e192bd13..e192bd13 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_pri_ringstation_sys_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pri_ringstation_sys_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_proj_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h
index 4e30447c..4e30447c 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_proj_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_proj_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_pwr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h
index 965f8663..965f8663 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_pwr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pwr_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h
index bcbb7b81..bcbb7b81 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_ram_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_therm_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_therm_gv11b.h
index a3cfcf91..a3cfcf91 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_therm_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_therm_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_timer_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_timer_gv11b.h
index 7d5750c2..7d5750c2 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_timer_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_timer_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_top_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_top_gv11b.h
index 2e2ff6ba..2e2ff6ba 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_top_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_top_gv11b.h
diff --git a/drivers/gpu/nvgpu/gv11b/hw_usermode_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_usermode_gv11b.h
index 8bcf163f..8bcf163f 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_usermode_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_usermode_gv11b.h