summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-11-10 14:38:41 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-11-13 21:56:30 -0500
commitfd2cac59f3491cb5b4f5d1f3fc97df94734bd682 (patch)
treef58b133d0add2c05a1d019cae026059fc0b9a78d
parentc9419732776a3f31b3c1ace0cd113151f3a4d7cd (diff)
gpu: nvgpu: Include UAPI explicitly
Add explicit #includes for <uapi/linux/nvgpu.h> for source code files that depend on it. JIRA NVGPU-259 Change-Id: I717d5f1493423fd3a7a34b6dd3380d33a9307a09 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1596254 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/common/as.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/cde.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/ce2.c2
-rw-r--r--drivers/gpu/nvgpu/common/linux/channel.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/clk_arb.c1
-rw-r--r--drivers/gpu/nvgpu/common/linux/vidmem.c1
-rw-r--r--drivers/gpu/nvgpu/common/mm/gmmu.c2
-rw-r--r--drivers/gpu/nvgpu/common/mm/vm.c2
-rw-r--r--drivers/gpu/nvgpu/common/mm/vm_area.c2
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c2
-rw-r--r--drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c2
-rw-r--r--drivers/gpu/nvgpu/gk20a/tsg_gk20a.c2
-rw-r--r--drivers/gpu/nvgpu/gm20b/gr_gm20b.c2
-rw-r--r--drivers/gpu/nvgpu/gp106/gr_gp106.c2
-rw-r--r--drivers/gpu/nvgpu/gp10b/fifo_gp10b.c2
-rw-r--r--drivers/gpu/nvgpu/gp10b/gr_gp10b.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/css_vgpu.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/dbg_vgpu.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/fifo_vgpu.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/gr_vgpu.c2
-rw-r--r--drivers/gpu/nvgpu/vgpu/mm_vgpu.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.c1
26 files changed, 37 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c
index f4f00fba..7ca754e1 100644
--- a/drivers/gpu/nvgpu/common/as.c
+++ b/drivers/gpu/nvgpu/common/as.c
@@ -23,6 +23,7 @@
23 */ 23 */
24 24
25#include <trace/events/gk20a.h> 25#include <trace/events/gk20a.h>
26#include <uapi/linux/nvgpu.h>
26 27
27#include <nvgpu/kmem.h> 28#include <nvgpu/kmem.h>
28#include <nvgpu/vm.h> 29#include <nvgpu/vm.h>
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c
index 8e847206..143e5b75 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -19,6 +19,7 @@
19#include <linux/dma-mapping.h> 19#include <linux/dma-mapping.h>
20#include <linux/fs.h> 20#include <linux/fs.h>
21#include <linux/dma-buf.h> 21#include <linux/dma-buf.h>
22#include <uapi/linux/nvgpu.h>
22 23
23#include <trace/events/gk20a.h> 24#include <trace/events/gk20a.h>
24 25
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/common/linux/ce2.c
index 5f89ef7b..f172cede 100644
--- a/drivers/gpu/nvgpu/common/linux/ce2.c
+++ b/drivers/gpu/nvgpu/common/linux/ce2.c
@@ -14,6 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include <uapi/linux/nvgpu.h>
18
17#include <nvgpu/types.h> 19#include <nvgpu/types.h>
18 20
19#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> 21#include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index c295336f..40b11b86 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -32,6 +32,7 @@
32#include <linux/uaccess.h> 32#include <linux/uaccess.h>
33#include <linux/dma-buf.h> 33#include <linux/dma-buf.h>
34#include <trace/events/gk20a.h> 34#include <trace/events/gk20a.h>
35#include <uapi/linux/nvgpu.h>
35 36
36u32 nvgpu_get_gpfifo_entry_size(void) 37u32 nvgpu_get_gpfifo_entry_size(void)
37{ 38{
diff --git a/drivers/gpu/nvgpu/common/linux/clk_arb.c b/drivers/gpu/nvgpu/common/linux/clk_arb.c
index ff26f567..ef89f980 100644
--- a/drivers/gpu/nvgpu/common/linux/clk_arb.c
+++ b/drivers/gpu/nvgpu/common/linux/clk_arb.c
@@ -31,6 +31,7 @@
31#ifdef CONFIG_DEBUG_FS 31#ifdef CONFIG_DEBUG_FS
32#include <linux/debugfs.h> 32#include <linux/debugfs.h>
33#endif 33#endif
34#include <uapi/linux/nvgpu.h>
34 35
35#include <nvgpu/bitops.h> 36#include <nvgpu/bitops.h>
36#include <nvgpu/lock.h> 37#include <nvgpu/lock.h>
diff --git a/drivers/gpu/nvgpu/common/linux/vidmem.c b/drivers/gpu/nvgpu/common/linux/vidmem.c
index 1e65b54d..1d9fea71 100644
--- a/drivers/gpu/nvgpu/common/linux/vidmem.c
+++ b/drivers/gpu/nvgpu/common/linux/vidmem.c
@@ -15,6 +15,7 @@
15 */ 15 */
16 16
17#include <linux/dma-buf.h> 17#include <linux/dma-buf.h>
18#include <uapi/linux/nvgpu.h>
18 19
19#include <linux/platform/tegra/tegra_fd.h> 20#include <linux/platform/tegra/tegra_fd.h>
20 21
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 4289104d..568da8c4 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -20,6 +20,8 @@
20 * DEALINGS IN THE SOFTWARE. 20 * DEALINGS IN THE SOFTWARE.
21 */ 21 */
22 22
23#include <uapi/linux/nvgpu.h>
24
23#include <nvgpu/log.h> 25#include <nvgpu/log.h>
24#include <nvgpu/list.h> 26#include <nvgpu/list.h>
25#include <nvgpu/dma.h> 27#include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 97c6d4ca..cfac4f8e 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -21,6 +21,8 @@
21 */ 21 */
22 22
23#include <nvgpu/bug.h> 23#include <nvgpu/bug.h>
24#include <uapi/linux/nvgpu.h>
25
24#include <nvgpu/log.h> 26#include <nvgpu/log.h>
25#include <nvgpu/dma.h> 27#include <nvgpu/dma.h>
26#include <nvgpu/vm.h> 28#include <nvgpu/vm.h>
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c
index fddec357..b6286c43 100644
--- a/drivers/gpu/nvgpu/common/mm/vm_area.c
+++ b/drivers/gpu/nvgpu/common/mm/vm_area.c
@@ -20,6 +20,8 @@
20 * DEALINGS IN THE SOFTWARE. 20 * DEALINGS IN THE SOFTWARE.
21 */ 21 */
22 22
23#include <uapi/linux/nvgpu.h>
24
23#include <nvgpu/vm.h> 25#include <nvgpu/vm.h>
24#include <nvgpu/vm_area.h> 26#include <nvgpu/vm_area.h>
25 27
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 9a8130ba..4be232f1 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -23,6 +23,7 @@
23 */ 23 */
24 24
25#include <trace/events/gk20a.h> 25#include <trace/events/gk20a.h>
26#include <uapi/linux/nvgpu.h>
26 27
27#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_GK20A_CYCLE_STATS) 28#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_GK20A_CYCLE_STATS)
28#include <linux/dma-buf.h> 29#include <linux/dma-buf.h>
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index fd31ab89..cf04e116 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -22,6 +22,8 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
25#include <nvgpu/kmem.h> 27#include <nvgpu/kmem.h>
26#include <nvgpu/log.h> 28#include <nvgpu/log.h>
27#include <nvgpu/vm.h> 29#include <nvgpu/vm.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index cd206c2a..d283a82e 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -24,6 +24,7 @@
24#ifdef CONFIG_DEBUG_FS 24#ifdef CONFIG_DEBUG_FS
25#include <linux/debugfs.h> 25#include <linux/debugfs.h>
26#endif 26#endif
27#include <uapi/linux/nvgpu.h>
27 28
28#include <nvgpu/kmem.h> 29#include <nvgpu/kmem.h>
29#include <nvgpu/dma.h> 30#include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 061ceba1..424b1695 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -23,6 +23,7 @@
23 */ 23 */
24 24
25#include <trace/events/gk20a.h> 25#include <trace/events/gk20a.h>
26#include <uapi/linux/nvgpu.h>
26 27
27#include <nvgpu/mm.h> 28#include <nvgpu/mm.h>
28#include <nvgpu/dma.h> 29#include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 5c13fec2..fc008169 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -23,6 +23,7 @@
23 */ 23 */
24 24
25#include <trace/events/gk20a.h> 25#include <trace/events/gk20a.h>
26#include <uapi/linux/nvgpu.h>
26 27
27#include <nvgpu/dma.h> 28#include <nvgpu/dma.h>
28#include <nvgpu/kmem.h> 29#include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 2b954e1a..d8478b2d 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -22,6 +22,8 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
25#include <nvgpu/nvgpu_common.h> 27#include <nvgpu/nvgpu_common.h>
26#include <nvgpu/timers.h> 28#include <nvgpu/timers.h>
27#include <nvgpu/kmem.h> 29#include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
index 640174a6..5af01a05 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
@@ -20,6 +20,8 @@
20 * DEALINGS IN THE SOFTWARE. 20 * DEALINGS IN THE SOFTWARE.
21 */ 21 */
22 22
23#include <uapi/linux/nvgpu.h>
24
23#include <nvgpu/kmem.h> 25#include <nvgpu/kmem.h>
24#include <nvgpu/log.h> 26#include <nvgpu/log.h>
25 27
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index c692d975..20f8e062 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -22,6 +22,8 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
25#include <nvgpu/kmem.h> 27#include <nvgpu/kmem.h>
26#include <nvgpu/log.h> 28#include <nvgpu/log.h>
27#include <nvgpu/enabled.h> 29#include <nvgpu/enabled.h>
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c
index 9c1dc0c5..1fb527d1 100644
--- a/drivers/gpu/nvgpu/gp106/gr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c
@@ -22,6 +22,8 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
25#include <nvgpu/dma.h> 27#include <nvgpu/dma.h>
26 28
27#include "gk20a/gk20a.h" 29#include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index accbe0a6..1c9249d1 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -22,6 +22,8 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
25#include <nvgpu/dma.h> 27#include <nvgpu/dma.h>
26#include <nvgpu/bug.h> 28#include <nvgpu/bug.h>
27#include <nvgpu/log2.h> 29#include <nvgpu/log2.h>
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index c9b2f859..559ea159 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -24,6 +24,7 @@
24 24
25#include <dt-bindings/soc/gm20b-fuse.h> 25#include <dt-bindings/soc/gm20b-fuse.h>
26#include <dt-bindings/soc/gp10b-fuse.h> 26#include <dt-bindings/soc/gp10b-fuse.h>
27#include <uapi/linux/nvgpu.h>
27 28
28#include <nvgpu/timers.h> 29#include <nvgpu/timers.h>
29#include <nvgpu/kmem.h> 30#include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
index 357d119d..7362fc6f 100644
--- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
@@ -23,6 +23,7 @@
23 23
24#include <linux/tegra-ivc.h> 24#include <linux/tegra-ivc.h>
25#include <linux/tegra_vgpu.h> 25#include <linux/tegra_vgpu.h>
26#include <uapi/linux/nvgpu.h>
26 27
27#include "gk20a/gk20a.h" 28#include "gk20a/gk20a.h"
28#include "gk20a/channel_gk20a.h" 29#include "gk20a/channel_gk20a.h"
diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
index 0ed66eb9..4879c2eb 100644
--- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
@@ -22,6 +22,7 @@
22 22
23#include <linux/tegra_gr_comm.h> 23#include <linux/tegra_gr_comm.h>
24#include <linux/tegra_vgpu.h> 24#include <linux/tegra_vgpu.h>
25#include <uapi/linux/nvgpu.h>
25 26
26#include "gk20a/gk20a.h" 27#include "gk20a/gk20a.h"
27#include "gk20a/channel_gk20a.h" 28#include "gk20a/channel_gk20a.h"
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 149a51c0..fa9388f2 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -24,6 +24,7 @@
24 24
25#include <linux/dma-mapping.h> 25#include <linux/dma-mapping.h>
26#include <trace/events/gk20a.h> 26#include <trace/events/gk20a.h>
27#include <uapi/linux/nvgpu.h>
27 28
28#include <nvgpu/kmem.h> 29#include <nvgpu/kmem.h>
29#include <nvgpu/dma.h> 30#include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 730f4b22..5dc6f68e 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -22,6 +22,8 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24 24
25#include <uapi/linux/nvgpu.h>
26
25#include <nvgpu/kmem.h> 27#include <nvgpu/kmem.h>
26#include <nvgpu/bug.h> 28#include <nvgpu/bug.h>
27 29
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
index a125366a..79d15d10 100644
--- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
@@ -23,6 +23,7 @@
23 */ 23 */
24 24
25#include <linux/dma-mapping.h> 25#include <linux/dma-mapping.h>
26#include <uapi/linux/nvgpu.h>
26 27
27#include <nvgpu/kmem.h> 28#include <nvgpu/kmem.h>
28#include <nvgpu/dma.h> 29#include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 4a85ee71..6a9e986b 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -27,6 +27,7 @@
27#include <linux/pm_runtime.h> 27#include <linux/pm_runtime.h>
28#include <linux/pm_qos.h> 28#include <linux/pm_qos.h>
29#include <soc/tegra/chip-id.h> 29#include <soc/tegra/chip-id.h>
30#include <uapi/linux/nvgpu.h>
30 31
31#include <nvgpu/kmem.h> 32#include <nvgpu/kmem.h>
32#include <nvgpu/bug.h> 33#include <nvgpu/bug.h>