diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/sort.h | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/volt/volt_dev.c | 3 |
4 files changed, 23 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index a5863567..5a50b843 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 24 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
25 | #include <linux/nvhost.h> | 25 | #include <linux/nvhost.h> |
26 | #endif | 26 | #endif |
27 | #include <linux/sort.h> | ||
28 | 27 | ||
29 | #include <nvgpu/dma.h> | 28 | #include <nvgpu/dma.h> |
30 | #include <nvgpu/timers.h> | 29 | #include <nvgpu/timers.h> |
@@ -33,6 +32,7 @@ | |||
33 | #include <nvgpu/log.h> | 32 | #include <nvgpu/log.h> |
34 | #include <nvgpu/soc.h> | 33 | #include <nvgpu/soc.h> |
35 | #include <nvgpu/atomic.h> | 34 | #include <nvgpu/atomic.h> |
35 | #include <nvgpu/sort.h> | ||
36 | 36 | ||
37 | #include "gk20a.h" | 37 | #include "gk20a.h" |
38 | #include "debug_gk20a.h" | 38 | #include "debug_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 96ec7f6e..8489816e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
26 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
27 | #include <linux/nvhost.h> | 27 | #include <linux/nvhost.h> |
28 | #include <linux/sort.h> | ||
29 | #include <trace/events/gk20a.h> | 28 | #include <trace/events/gk20a.h> |
30 | 29 | ||
31 | #include <nvgpu/dma.h> | 30 | #include <nvgpu/dma.h> |
@@ -34,6 +33,7 @@ | |||
34 | #include <nvgpu/nvgpu_common.h> | 33 | #include <nvgpu/nvgpu_common.h> |
35 | #include <nvgpu/log.h> | 34 | #include <nvgpu/log.h> |
36 | #include <nvgpu/bsearch.h> | 35 | #include <nvgpu/bsearch.h> |
36 | #include <nvgpu/sort.h> | ||
37 | 37 | ||
38 | #include "gk20a.h" | 38 | #include "gk20a.h" |
39 | #include "kind_gk20a.h" | 39 | #include "kind_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sort.h b/drivers/gpu/nvgpu/include/nvgpu/sort.h new file mode 100644 index 00000000..70e0f47f --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/sort.h | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2017, 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 __NVGPU_SORT_H__ | ||
14 | #define __NVGPU_SORT_H__ | ||
15 | |||
16 | #ifdef __KERNEL__ | ||
17 | #include <linux/sort.h> | ||
18 | #endif | ||
19 | |||
20 | #endif | ||
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index 8e229f4c..9fd80144 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c | |||
@@ -11,8 +11,7 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/sort.h> | 14 | #include <nvgpu/sort.h> |
15 | |||
16 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 15 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
17 | #include <nvgpu/bios.h> | 16 | #include <nvgpu/bios.h> |
18 | #include <nvgpu/kmem.h> | 17 | #include <nvgpu/kmem.h> |