From a66d9cfde553f93ef9b286537db9515c47201317 Mon Sep 17 00:00:00 2001 From: Aparna Das Date: Mon, 4 Feb 2019 11:44:03 -0800 Subject: [PATCH] gpu: nvgpu: vgpu: move common vgpu code to nvgpu common All code that is common across OSes resides under nvgpu common path. Follow the same for vgpu. Jira GVSCI-334 Change-Id: Ie1c6f4611ee2d799efaa43c62d6d96ef2fe982a5 Signed-off-by: Aparna Das Reviewed-on: https://git-master.nvidia.com/r/2011757 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 46 +++++++++---------- drivers/gpu/nvgpu/Makefile.sources | 44 +++++++++--------- .../gpu/nvgpu/{ => common}/vgpu/ce2_vgpu.c | 2 +- .../gpu/nvgpu/{ => common}/vgpu/clk_vgpu.c | 0 .../gpu/nvgpu/{ => common}/vgpu/clk_vgpu.h | 0 .../gpu/nvgpu/{ => common}/vgpu/css_vgpu.c | 2 +- .../gpu/nvgpu/{ => common}/vgpu/css_vgpu.h | 0 .../gpu/nvgpu/{ => common}/vgpu/dbg_vgpu.c | 0 .../gpu/nvgpu/{ => common}/vgpu/dbg_vgpu.h | 0 .../gpu/nvgpu/{ => common}/vgpu/ecc_vgpu.c | 4 +- .../gpu/nvgpu/{ => common}/vgpu/ecc_vgpu.h | 2 +- .../nvgpu/{ => common}/vgpu/fecs_trace_vgpu.c | 2 +- .../nvgpu/{ => common}/vgpu/fecs_trace_vgpu.h | 0 .../gpu/nvgpu/{ => common}/vgpu/fifo_vgpu.c | 0 .../gpu/nvgpu/{ => common}/vgpu/fifo_vgpu.h | 0 .../{ => common}/vgpu/gm20b/vgpu_gr_gm20b.c | 2 +- .../{ => common}/vgpu/gm20b/vgpu_gr_gm20b.h | 0 .../{ => common}/vgpu/gp10b/vgpu_fuse_gp10b.c | 0 .../{ => common}/vgpu/gp10b/vgpu_fuse_gp10b.h | 2 +- .../{ => common}/vgpu/gp10b/vgpu_gr_gp10b.c | 2 +- .../{ => common}/vgpu/gp10b/vgpu_gr_gp10b.h | 0 .../{ => common}/vgpu/gp10b/vgpu_hal_gp10b.c | 16 +++---- .../{ => common}/vgpu/gp10b/vgpu_mm_gp10b.c | 0 .../{ => common}/vgpu/gp10b/vgpu_mm_gp10b.h | 0 drivers/gpu/nvgpu/{ => common}/vgpu/gr_vgpu.c | 0 drivers/gpu/nvgpu/{ => common}/vgpu/gr_vgpu.h | 0 .../{ => common}/vgpu/gv11b/vgpu_fifo_gv11b.c | 0 .../{ => common}/vgpu/gv11b/vgpu_fifo_gv11b.h | 0 .../{ => common}/vgpu/gv11b/vgpu_gr_gv11b.c | 2 +- .../{ => common}/vgpu/gv11b/vgpu_gr_gv11b.h | 0 .../{ => common}/vgpu/gv11b/vgpu_gv11b.c | 0 .../{ => common}/vgpu/gv11b/vgpu_gv11b.h | 0 .../{ => common}/vgpu/gv11b/vgpu_hal_gv11b.c | 20 ++++---- .../vgpu/gv11b/vgpu_subctx_gv11b.c | 0 .../vgpu/gv11b/vgpu_subctx_gv11b.h | 0 .../{ => common}/vgpu/gv11b/vgpu_tsg_gv11b.c | 0 .../{ => common}/vgpu/gv11b/vgpu_tsg_gv11b.h | 0 .../gpu/nvgpu/{ => common}/vgpu/ltc_vgpu.c | 0 .../gpu/nvgpu/{ => common}/vgpu/ltc_vgpu.h | 0 drivers/gpu/nvgpu/{ => common}/vgpu/mm_vgpu.c | 0 drivers/gpu/nvgpu/{ => common}/vgpu/mm_vgpu.h | 0 .../gpu/nvgpu/{ => common}/vgpu/tsg_vgpu.c | 0 drivers/gpu/nvgpu/{ => common}/vgpu/vgpu.c | 0 .../os/linux/vgpu/fecs_trace_vgpu_linux.c | 4 +- .../vgpu/gv11b/platform_gv11b_vgpu_tegra.c | 4 +- .../nvgpu/os/linux/vgpu/platform_vgpu_tegra.c | 4 +- drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c | 4 +- drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 4 +- 48 files changed, 83 insertions(+), 83 deletions(-) rename drivers/gpu/nvgpu/{ => common}/vgpu/ce2_vgpu.c (95%) rename drivers/gpu/nvgpu/{ => common}/vgpu/clk_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/clk_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/css_vgpu.c (99%) rename drivers/gpu/nvgpu/{ => common}/vgpu/css_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/dbg_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/dbg_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/ecc_vgpu.c (96%) rename drivers/gpu/nvgpu/{ => common}/vgpu/ecc_vgpu.h (95%) rename drivers/gpu/nvgpu/{ => common}/vgpu/fecs_trace_vgpu.c (99%) rename drivers/gpu/nvgpu/{ => common}/vgpu/fecs_trace_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/fifo_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/fifo_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gm20b/vgpu_gr_gm20b.c (98%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gm20b/vgpu_gr_gm20b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_fuse_gp10b.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_fuse_gp10b.h (95%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_gr_gp10b.c (99%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_gr_gp10b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_hal_gp10b.c (98%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_mm_gp10b.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gp10b/vgpu_mm_gp10b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gr_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gr_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_fifo_gv11b.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_fifo_gv11b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_gr_gv11b.c (97%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_gr_gv11b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_gv11b.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_gv11b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_hal_gv11b.c (98%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_subctx_gv11b.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_subctx_gv11b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_tsg_gv11b.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/gv11b/vgpu_tsg_gv11b.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/ltc_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/ltc_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/mm_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/mm_vgpu.h (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/tsg_vgpu.c (100%) rename drivers/gpu/nvgpu/{ => common}/vgpu/vgpu.c (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 76b4cdb90..bd451650d 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -383,29 +383,29 @@ nvgpu-$(CONFIG_GK20A_VIDMEM) += \ common/mm/vidmem.o nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ - vgpu/ltc_vgpu.o \ - vgpu/gr_vgpu.o \ - vgpu/fifo_vgpu.o \ - vgpu/ce2_vgpu.o \ - vgpu/mm_vgpu.o \ - vgpu/vgpu.o \ - vgpu/dbg_vgpu.o \ - vgpu/tsg_vgpu.o \ - vgpu/css_vgpu.o \ - vgpu/ecc_vgpu.o \ - vgpu/clk_vgpu.o \ - vgpu/fecs_trace_vgpu.o \ - vgpu/gm20b/vgpu_gr_gm20b.o \ - vgpu/gp10b/vgpu_hal_gp10b.o \ - vgpu/gp10b/vgpu_gr_gp10b.o \ - vgpu/gp10b/vgpu_fuse_gp10b.o \ - vgpu/gp10b/vgpu_mm_gp10b.o \ - vgpu/gv11b/vgpu_gv11b.o \ - vgpu/gv11b/vgpu_hal_gv11b.o \ - vgpu/gv11b/vgpu_gr_gv11b.o \ - vgpu/gv11b/vgpu_fifo_gv11b.o \ - vgpu/gv11b/vgpu_subctx_gv11b.o \ - vgpu/gv11b/vgpu_tsg_gv11b.o \ + common/vgpu/ltc_vgpu.o \ + common/vgpu/gr_vgpu.o \ + common/vgpu/fifo_vgpu.o \ + common/vgpu/ce2_vgpu.o \ + common/vgpu/mm_vgpu.o \ + common/vgpu/vgpu.o \ + common/vgpu/dbg_vgpu.o \ + common/vgpu/tsg_vgpu.o \ + common/vgpu/css_vgpu.o \ + common/vgpu/ecc_vgpu.o \ + common/vgpu/clk_vgpu.o \ + common/vgpu/fecs_trace_vgpu.o \ + common/vgpu/gm20b/vgpu_gr_gm20b.o \ + common/vgpu/gp10b/vgpu_hal_gp10b.o \ + common/vgpu/gp10b/vgpu_gr_gp10b.o \ + common/vgpu/gp10b/vgpu_fuse_gp10b.o \ + common/vgpu/gp10b/vgpu_mm_gp10b.o \ + common/vgpu/gv11b/vgpu_gv11b.o \ + common/vgpu/gv11b/vgpu_hal_gv11b.o \ + common/vgpu/gv11b/vgpu_gr_gv11b.o \ + common/vgpu/gv11b/vgpu_fifo_gv11b.o \ + common/vgpu/gv11b/vgpu_subctx_gv11b.o \ + common/vgpu/gv11b/vgpu_tsg_gv11b.o \ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ common/perf/cyclestats_snapshot.o diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index ce294a6d1..123c3431b 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -307,28 +307,28 @@ srcs += common/sim.c \ tu104/sec2_tu104.c \ tu104/func_tu104.c \ tu104/fecs_trace_tu104.c \ - vgpu/vgpu.c \ - vgpu/fifo_vgpu.c \ - vgpu/tsg_vgpu.c \ - vgpu/css_vgpu.c \ - vgpu/fecs_trace_vgpu.c \ - vgpu/mm_vgpu.c \ - vgpu/gr_vgpu.c \ - vgpu/clk_vgpu.c \ - vgpu/dbg_vgpu.c \ - vgpu/ltc_vgpu.c \ - vgpu/ce2_vgpu.c \ - vgpu/gv11b/vgpu_gv11b.c \ - vgpu/gv11b/vgpu_hal_gv11b.c \ - vgpu/gv11b/vgpu_fifo_gv11b.c \ - vgpu/gv11b/vgpu_tsg_gv11b.c \ - vgpu/gv11b/vgpu_subctx_gv11b.c \ - vgpu/gv11b/vgpu_gr_gv11b.c \ - vgpu/gp10b/vgpu_hal_gp10b.c \ - vgpu/gp10b/vgpu_fuse_gp10b.c \ - vgpu/gp10b/vgpu_mm_gp10b.c \ - vgpu/gp10b/vgpu_gr_gp10b.c \ - vgpu/gm20b/vgpu_gr_gm20b.c + common/vgpu/vgpu.c \ + common/vgpu/fifo_vgpu.c \ + common/vgpu/tsg_vgpu.c \ + common/vgpu/css_vgpu.c \ + common/vgpu/fecs_trace_vgpu.c \ + common/vgpu/mm_vgpu.c \ + common/vgpu/gr_vgpu.c \ + common/vgpu/clk_vgpu.c \ + common/vgpu/dbg_vgpu.c \ + common/vgpu/ltc_vgpu.c \ + common/vgpu/ce2_vgpu.c \ + common/vgpu/gv11b/vgpu_gv11b.c \ + common/vgpu/gv11b/vgpu_hal_gv11b.c \ + common/vgpu/gv11b/vgpu_fifo_gv11b.c \ + common/vgpu/gv11b/vgpu_tsg_gv11b.c \ + common/vgpu/gv11b/vgpu_subctx_gv11b.c \ + common/vgpu/gv11b/vgpu_gr_gv11b.c \ + common/vgpu/gp10b/vgpu_hal_gp10b.c \ + common/vgpu/gp10b/vgpu_fuse_gp10b.c \ + common/vgpu/gp10b/vgpu_mm_gp10b.c \ + common/vgpu/gp10b/vgpu_gr_gp10b.c \ + common/vgpu/gm20b/vgpu_gr_gm20b.c ifeq ($(NVGPU_DEBUGGER),1) srcs += common/debugger.c diff --git a/drivers/gpu/nvgpu/vgpu/ce2_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/ce2_vgpu.c similarity index 95% rename from drivers/gpu/nvgpu/vgpu/ce2_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/ce2_vgpu.c index 319a9eddd..f79ad908f 100644 --- a/drivers/gpu/nvgpu/vgpu/ce2_vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/ce2_vgpu.c @@ -1,7 +1,7 @@ /* * Virtualized GPU CE2 * - * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2015-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/drivers/gpu/nvgpu/vgpu/clk_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/clk_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/clk_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/clk_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/clk_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/clk_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/clk_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/clk_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/css_vgpu.c similarity index 99% rename from drivers/gpu/nvgpu/vgpu/css_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/css_vgpu.c index 9e2c9c4f0..8412f9c47 100644 --- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/css_vgpu.c @@ -30,7 +30,7 @@ #include #include -#include "vgpu/css_vgpu.h" +#include "common/vgpu/css_vgpu.h" static struct tegra_hv_ivm_cookie *css_cookie; diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/css_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/css_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/css_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/dbg_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/dbg_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/dbg_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/dbg_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/dbg_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/dbg_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/ecc_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/ecc_vgpu.c similarity index 96% rename from drivers/gpu/nvgpu/vgpu/ecc_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/ecc_vgpu.c index 464b2911a..b81bfef46 100644 --- a/drivers/gpu/nvgpu/vgpu/ecc_vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/ecc_vgpu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,7 +25,7 @@ #include #include -#include "vgpu/ecc_vgpu.h" +#include "common/vgpu/ecc_vgpu.h" int vgpu_ecc_get_info(struct gk20a *g) { diff --git a/drivers/gpu/nvgpu/vgpu/ecc_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/ecc_vgpu.h similarity index 95% rename from drivers/gpu/nvgpu/vgpu/ecc_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/ecc_vgpu.h index 0fcaa3fac..3a66d92dd 100644 --- a/drivers/gpu/nvgpu/vgpu/ecc_vgpu.h +++ b/drivers/gpu/nvgpu/common/vgpu/ecc_vgpu.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.c similarity index 99% rename from drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.c index 81b13c1ec..f6d230ad2 100644 --- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.c @@ -32,7 +32,7 @@ #include #include "gk20a/fecs_trace_gk20a.h" -#include "vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/fecs_trace_vgpu.h" int vgpu_fecs_trace_init(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/fifo_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/fifo_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/fifo_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/fifo_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/fifo_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/fifo_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c b/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c similarity index 98% rename from drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c rename to drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c index 567a60608..ef19f2d99 100644 --- a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c @@ -24,7 +24,7 @@ #include #include -#include "vgpu/css_vgpu.h" +#include "common/vgpu/css_vgpu.h" #include "vgpu_gr_gm20b.h" void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h b/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gm20b/vgpu_gr_gm20b.h rename to drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.h diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_fuse_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.c rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_fuse_gp10b.c diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.h b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_fuse_gp10b.h similarity index 95% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.h rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_fuse_gp10b.h index 12334f23a..64553abbe 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_fuse_gp10b.h +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_fuse_gp10b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_gr_gp10b.c similarity index 99% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_gr_gp10b.c index 1106c414c..be8d38d14 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_gr_gp10b.c @@ -30,7 +30,7 @@ #include #include -#include "vgpu/gm20b/vgpu_gr_gm20b.h" +#include "common/vgpu/gm20b/vgpu_gr_gm20b.h" #include "gp10b/gr_gp10b.h" #include "vgpu_gr_gp10b.h" diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_gr_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.h rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_gr_gp10b.h diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c similarity index 98% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c index c3a319e50..f271b14ab 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -41,16 +41,16 @@ #include "common/fifo/runlist_gk20a.h" #include "common/fifo/channel_gm20b.h" -#include "vgpu/fifo_vgpu.h" -#include "vgpu/gr_vgpu.h" -#include "vgpu/ltc_vgpu.h" -#include "vgpu/mm_vgpu.h" -#include "vgpu/dbg_vgpu.h" -#include "vgpu/fecs_trace_vgpu.h" -#include "vgpu/css_vgpu.h" +#include "common/vgpu/fifo_vgpu.h" +#include "common/vgpu/gr_vgpu.h" +#include "common/vgpu/ltc_vgpu.h" +#include "common/vgpu/mm_vgpu.h" +#include "common/vgpu/dbg_vgpu.h" +#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/css_vgpu.h" #include "gp10b/gp10b.h" #include "gp10b/hal_gp10b.h" -#include "vgpu/gm20b/vgpu_gr_gm20b.h" +#include "common/vgpu/gm20b/vgpu_gr_gm20b.h" #include "vgpu_gr_gp10b.h" #include "vgpu_mm_gp10b.h" #include "vgpu_fuse_gp10b.h" diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_mm_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_mm_gp10b.c diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.h b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_mm_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.h rename to drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_mm_gp10b.h diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/gr_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gr_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/gr_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/gr_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gr_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/gr_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_fifo_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_fifo_gv11b.c diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.h b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_fifo_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.h rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_fifo_gv11b.h diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gr_gv11b.c similarity index 97% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gr_gv11b.c index 979a37851..f74c60ba6 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gr_gv11b.c @@ -22,7 +22,7 @@ #include -#include "vgpu/gr_vgpu.h" +#include "common/vgpu/gr_vgpu.h" #include "vgpu_subctx_gv11b.h" #include "vgpu_gr_gv11b.h" diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.h b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gr_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.h rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gr_gv11b.h diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gv11b.c diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.h b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.h rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_gv11b.h diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c similarity index 98% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c index d2516a9c4..067ce6438 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -52,16 +52,16 @@ #include #include -#include "vgpu/fifo_vgpu.h" -#include "vgpu/gr_vgpu.h" -#include "vgpu/ltc_vgpu.h" -#include "vgpu/mm_vgpu.h" -#include "vgpu/dbg_vgpu.h" -#include "vgpu/fecs_trace_vgpu.h" -#include "vgpu/css_vgpu.h" -#include "vgpu/gm20b/vgpu_gr_gm20b.h" -#include "vgpu/gp10b/vgpu_mm_gp10b.h" -#include "vgpu/gp10b/vgpu_gr_gp10b.h" +#include "common/vgpu/fifo_vgpu.h" +#include "common/vgpu/gr_vgpu.h" +#include "common/vgpu/ltc_vgpu.h" +#include "common/vgpu/mm_vgpu.h" +#include "common/vgpu/dbg_vgpu.h" +#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/css_vgpu.h" +#include "common/vgpu/gm20b/vgpu_gr_gm20b.h" +#include "common/vgpu/gp10b/vgpu_mm_gp10b.h" +#include "common/vgpu/gp10b/vgpu_gr_gp10b.h" #include "common/falcon/falcon_gk20a.h" diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_subctx_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_subctx_gv11b.c diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.h b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_subctx_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.h rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_subctx_gv11b.h diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_tsg_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_tsg_gv11b.c diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.h b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_tsg_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.h rename to drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_tsg_gv11b.h diff --git a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/ltc_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/ltc_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/ltc_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/ltc_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/ltc_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/ltc_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/ltc_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/mm_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/mm_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/mm_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/mm_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/vgpu/mm_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/mm_vgpu.h diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/tsg_vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/tsg_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/tsg_vgpu.c diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/common/vgpu/vgpu.c similarity index 100% rename from drivers/gpu/nvgpu/vgpu/vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/vgpu.c diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu_linux.c index a555e5de8..0c612576a 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu_linux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2019, 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, @@ -21,7 +21,7 @@ #include -#include "vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/fecs_trace_vgpu.h" void vgpu_fecs_trace_data_update(struct gk20a *g) { diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c index 1da0ca9d9..5e1aac188 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2019, 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, @@ -21,7 +21,7 @@ #include #include -#include "vgpu/clk_vgpu.h" +#include "common/vgpu/clk_vgpu.h" #include "os/linux/platform_gk20a.h" #include "os/linux/os_linux.h" #include "os/linux/vgpu/vgpu_linux.h" diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c index df3d61833..ad9e0ee00 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c @@ -1,7 +1,7 @@ /* * Tegra Virtualized GPU Platform Interface * - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2019, 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, @@ -20,7 +20,7 @@ #include #include "os/linux/platform_gk20a.h" -#include "vgpu/clk_vgpu.h" +#include "common/vgpu/clk_vgpu.h" #include "vgpu_linux.h" static int gk20a_tegra_probe(struct device *dev) diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c index 30ca7f53c..eccc8b76f 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2019, 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, @@ -19,7 +19,7 @@ #include "os/linux/platform_gk20a.h" #include "os/linux/os_linux.h" -#include "vgpu/ecc_vgpu.h" +#include "common/vgpu/ecc_vgpu.h" static ssize_t vgpu_load_show(struct device *dev, struct device_attribute *attr, diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index 334e4b6c4..4e7e7221c 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -37,8 +37,8 @@ #include #include "vgpu_linux.h" -#include "vgpu/fecs_trace_vgpu.h" -#include "vgpu/clk_vgpu.h" +#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/clk_vgpu.h" #include "gm20b/hal_gm20b.h" #include "os/linux/module.h"