diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.nvgpu | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/nvgpu_common.c (renamed from drivers/gpu/nvgpu/nvgpu_common.c) | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm206/acr_gm206.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm206/bios_gm206.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h (renamed from drivers/gpu/nvgpu/nvgpu_common.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pci.c | 7 |
13 files changed, 24 insertions, 18 deletions
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu index 9a061493..0f8f5bc1 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu +++ b/drivers/gpu/nvgpu/Makefile.nvgpu | |||
@@ -31,7 +31,7 @@ nvgpu-y := \ | |||
31 | common/mm/buddy_allocator.o \ | 31 | common/mm/buddy_allocator.o \ |
32 | common/mm/page_allocator.o \ | 32 | common/mm/page_allocator.o \ |
33 | common/mm/lockless_allocator.o \ | 33 | common/mm/lockless_allocator.o \ |
34 | nvgpu_common.o \ | 34 | common/nvgpu_common.o \ |
35 | gk20a/gk20a.o \ | 35 | gk20a/gk20a.o \ |
36 | gk20a/sched_gk20a.o \ | 36 | gk20a/sched_gk20a.o \ |
37 | gk20a/as_gk20a.o \ | 37 | gk20a/as_gk20a.o \ |
diff --git a/drivers/gpu/nvgpu/nvgpu_common.c b/drivers/gpu/nvgpu/common/nvgpu_common.c index 3e57c83d..80f1cca0 100644 --- a/drivers/gpu/nvgpu/nvgpu_common.c +++ b/drivers/gpu/nvgpu/common/nvgpu_common.c | |||
@@ -17,10 +17,10 @@ | |||
17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
18 | #include <linux/firmware.h> | 18 | #include <linux/firmware.h> |
19 | 19 | ||
20 | #include "nvgpu_common.h" | ||
21 | #include "gk20a/gk20a_scale.h" | 20 | #include "gk20a/gk20a_scale.h" |
22 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
23 | #include "nvgpu_common.h" | 22 | |
23 | #include <nvgpu/nvgpu_common.h> | ||
24 | 24 | ||
25 | #define EMC3D_DEFAULT_RATIO 750 | 25 | #define EMC3D_DEFAULT_RATIO 750 |
26 | 26 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 384fbdef..b4a1f6f4 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <trace/events/gk20a.h> | 25 | #include <trace/events/gk20a.h> |
26 | 26 | ||
27 | #include <nvgpu/timers.h> | 27 | #include <nvgpu/timers.h> |
28 | #include <nvgpu/nvgpu_common.h> | ||
28 | 29 | ||
29 | #include "gk20a.h" | 30 | #include "gk20a.h" |
30 | #include "channel_gk20a.h" | 31 | #include "channel_gk20a.h" |
@@ -34,7 +35,6 @@ | |||
34 | #include "gr_gk20a.h" | 35 | #include "gr_gk20a.h" |
35 | #include "debug_gk20a.h" | 36 | #include "debug_gk20a.h" |
36 | #include "semaphore_gk20a.h" | 37 | #include "semaphore_gk20a.h" |
37 | #include "nvgpu_common.h" | ||
38 | 38 | ||
39 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 39 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
40 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 40 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index f3ccd613..ee6586ae 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -42,11 +42,11 @@ | |||
42 | #include <linux/sched.h> | 42 | #include <linux/sched.h> |
43 | #include <linux/version.h> | 43 | #include <linux/version.h> |
44 | 44 | ||
45 | #include <nvgpu/nvgpu_common.h> | ||
45 | #include <nvgpu/allocator.h> | 46 | #include <nvgpu/allocator.h> |
46 | #include <nvgpu/timers.h> | 47 | #include <nvgpu/timers.h> |
47 | 48 | ||
48 | #include "gk20a.h" | 49 | #include "gk20a.h" |
49 | #include "nvgpu_common.h" | ||
50 | #include "debug_gk20a.h" | 50 | #include "debug_gk20a.h" |
51 | #include "ctrl_gk20a.h" | 51 | #include "ctrl_gk20a.h" |
52 | #include "channel_sync_gk20a.h" | 52 | #include "channel_sync_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c index e651ad2e..7342cb1d 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * GK20A Graphics Context | 4 | * GK20A Graphics Context |
5 | * | 5 | * |
6 | * Copyright (c) 2011-2016, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
@@ -21,9 +21,10 @@ | |||
21 | 21 | ||
22 | #include <linux/firmware.h> | 22 | #include <linux/firmware.h> |
23 | 23 | ||
24 | #include <nvgpu/nvgpu_common.h> | ||
25 | |||
24 | #include "gk20a.h" | 26 | #include "gk20a.h" |
25 | #include "gr_ctx_gk20a.h" | 27 | #include "gr_ctx_gk20a.h" |
26 | #include "nvgpu_common.h" | ||
27 | 28 | ||
28 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | 29 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 5802cb68..cddb3316 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <trace/events/gk20a.h> | 32 | #include <trace/events/gk20a.h> |
33 | 33 | ||
34 | #include <nvgpu/timers.h> | 34 | #include <nvgpu/timers.h> |
35 | #include <nvgpu/nvgpu_common.h> | ||
35 | 36 | ||
36 | #include "gk20a.h" | 37 | #include "gk20a.h" |
37 | #include "kind_gk20a.h" | 38 | #include "kind_gk20a.h" |
@@ -43,7 +44,6 @@ | |||
43 | #include "semaphore_gk20a.h" | 44 | #include "semaphore_gk20a.h" |
44 | #include "platform_gk20a.h" | 45 | #include "platform_gk20a.h" |
45 | #include "ctxsw_trace_gk20a.h" | 46 | #include "ctxsw_trace_gk20a.h" |
46 | #include "nvgpu_common.h" | ||
47 | 47 | ||
48 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 48 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
49 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> | 49 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 0a2d36fe..9924e48f 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -24,12 +24,12 @@ | |||
24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
25 | #include <linux/uaccess.h> | 25 | #include <linux/uaccess.h> |
26 | 26 | ||
27 | #include <nvgpu/nvgpu_common.h> | ||
27 | #include <nvgpu/timers.h> | 28 | #include <nvgpu/timers.h> |
28 | 29 | ||
29 | #include "gk20a.h" | 30 | #include "gk20a.h" |
30 | #include "gr_gk20a.h" | 31 | #include "gr_gk20a.h" |
31 | #include "semaphore_gk20a.h" | 32 | #include "semaphore_gk20a.h" |
32 | #include "nvgpu_common.h" | ||
33 | 33 | ||
34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
35 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.c b/drivers/gpu/nvgpu/gm206/acr_gm206.c index 523f0c33..238114e3 100644 --- a/drivers/gpu/nvgpu/gm206/acr_gm206.c +++ b/drivers/gpu/nvgpu/gm206/acr_gm206.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 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, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -25,7 +25,8 @@ | |||
25 | 25 | ||
26 | #include "acr.h" | 26 | #include "acr.h" |
27 | #include "acr_gm206.h" | 27 | #include "acr_gm206.h" |
28 | #include "nvgpu_common.h" | 28 | |
29 | #include <nvgpu/nvgpu_common.h> | ||
29 | 30 | ||
30 | #include <nvgpu/hw/gm206/hw_pwr_gm206.h> | 31 | #include <nvgpu/hw/gm206/hw_pwr_gm206.h> |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index fa736da5..a5551f42 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 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, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -20,7 +20,8 @@ | |||
20 | #include "gm20b/fifo_gm20b.h" | 20 | #include "gm20b/fifo_gm20b.h" |
21 | #include "fifo_gm206.h" | 21 | #include "fifo_gm206.h" |
22 | #include "bios_gm206.h" | 22 | #include "bios_gm206.h" |
23 | #include "nvgpu_common.h" | 23 | |
24 | #include <nvgpu/nvgpu_common.h> | ||
24 | 25 | ||
25 | #include <nvgpu/hw/gm206/hw_pwr_gm206.h> | 26 | #include <nvgpu/hw/gm206/hw_pwr_gm206.h> |
26 | #include <nvgpu/hw/gm206/hw_mc_gm206.h> | 27 | #include <nvgpu/hw/gm206/hw_mc_gm206.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index e47bc773..060dc778 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -22,8 +22,7 @@ | |||
22 | #include <linux/platform/tegra/mc.h> | 22 | #include <linux/platform/tegra/mc.h> |
23 | 23 | ||
24 | #include <nvgpu/timers.h> | 24 | #include <nvgpu/timers.h> |
25 | 25 | #include <nvgpu/nvgpu_common.h> | |
26 | #include "nvgpu_common.h" | ||
27 | 26 | ||
28 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/pmu_gk20a.h" | 28 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 308f1caf..9e844994 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -29,7 +29,8 @@ | |||
29 | 29 | ||
30 | #include "sec2_gp106.h" | 30 | #include "sec2_gp106.h" |
31 | #include "nvgpu_gpuid_t18x.h" | 31 | #include "nvgpu_gpuid_t18x.h" |
32 | #include "nvgpu_common.h" | 32 | |
33 | #include <nvgpu/nvgpu_common.h> | ||
33 | 34 | ||
34 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> | 35 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> |
35 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | 36 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> |
diff --git a/drivers/gpu/nvgpu/nvgpu_common.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h index 85b4a3df..85b4a3df 100644 --- a/drivers/gpu/nvgpu/nvgpu_common.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h | |||
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c index 648fc60e..a81090a2 100644 --- a/drivers/gpu/nvgpu/pci.c +++ b/drivers/gpu/nvgpu/pci.c | |||
@@ -17,12 +17,15 @@ | |||
17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/pm_runtime.h> | 19 | #include <linux/pm_runtime.h> |
20 | #include "pci.h" | 20 | |
21 | #include "nvgpu_common.h" | 21 | #include <nvgpu/nvgpu_common.h> |
22 | |||
22 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
23 | #include "gk20a/platform_gk20a.h" | 24 | #include "gk20a/platform_gk20a.h" |
24 | #include "clk/clk.h" | 25 | #include "clk/clk.h" |
25 | 26 | ||
27 | #include "pci.h" | ||
28 | |||
26 | #define PCI_INTERFACE_NAME "card-%s%%s" | 29 | #define PCI_INTERFACE_NAME "card-%s%%s" |
27 | 30 | ||
28 | static int nvgpu_pci_tegra_probe(struct device *dev) | 31 | static int nvgpu_pci_tegra_probe(struct device *dev) |