From c45462288d09955b2a163274d501c4d0aa10a74b Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 26 Jan 2018 18:07:51 -0800 Subject: gpu: nvgpu: vgpu: move tegra_vgpu.h to include/nvgpu/vgpu/ tegra_vgpu.h is os agnostic, so move it out of linux folder. Jira EVLR-2364 Change-Id: Ibbe8923f7af036b3b6730f682f5243ca73810f7b Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1649936 Reviewed-by: Aingara Paramakuru Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: Nirav Patel Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c | 2 +- drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c | 2 +- drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c | 2 +- drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c | 3 +-- drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c | 4 ++-- drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c | 4 ++-- drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c | 3 +-- drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h | 5 ++--- 8 files changed, 11 insertions(+), 14 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c index e0798475..6a0da7dc 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c @@ -16,7 +16,7 @@ #if defined(CONFIG_GK20A_CYCLE_STATS) #include -#include +#include #include #include "gk20a/gk20a.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c index ec6fd875..90679cc7 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c @@ -15,8 +15,8 @@ */ #include +#include -#include #include #include "gk20a/gk20a.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c index 67a00c36..52a25893 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c @@ -15,7 +15,6 @@ */ #include -#include #include @@ -24,6 +23,7 @@ #include #include #include +#include #include "gk20a/gk20a.h" #include "vgpu.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c index af25e486..c2129e4b 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c @@ -19,8 +19,7 @@ #include "common/linux/vgpu/vgpu.h" #include "gv11b/fifo_gv11b.h" #include - -#include +#include #ifdef CONFIG_TEGRA_GK20A_NVHOST diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c index a0099f03..5fbc7bbe 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -16,7 +16,7 @@ #include "gk20a/gk20a.h" #include "common/linux/vgpu/vgpu.h" -#include +#include #include int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c index 8b060b24..82a3db8f 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include +#include #include "gk20a/gk20a.h" #include "common/linux/vgpu/vgpu.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c index 19987f0c..421763ec 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c @@ -14,8 +14,6 @@ * along with this program. If not, see . */ -#include - #include "gk20a/gk20a.h" #include "gk20a/channel_gk20a.h" #include "gk20a/tsg_gk20a.h" @@ -24,6 +22,7 @@ #include "fifo_vgpu.h" #include +#include int vgpu_tsg_open(struct tsg_gk20a *tsg) { diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h index f59ad5bf..e9a73baf 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h @@ -27,14 +27,13 @@ struct gk20a_platform; #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION #include +#include +#include -#include #include "gk20a/gk20a.h" #include "common/linux/platform_gk20a.h" #include "common/linux/os_linux.h" -#include - struct vgpu_priv_data { u64 virt_handle; struct nvgpu_thread intr_handler; -- cgit v1.2.2