From ea545bd4976f55d189b80d191707ec877cbd43a9 Mon Sep 17 00:00:00 2001 From: Aparna Das Date: Mon, 18 Mar 2019 18:27:50 -0700 Subject: [PATCH] gpu: nvgpu: vgpu: move fecs files to gr Move fecs_trace_vgpu* files to nvgpu/common/vgpu/gr in conformance with native path structure. Jira GVSCI-334 Change-Id: I5aa304ab701ea369d60095bddb2656c073a2446c Signed-off-by: Aparna Das Reviewed-on: https://git-master.nvidia.com/r/2075951 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 2 +- drivers/gpu/nvgpu/Makefile.sources | 2 +- drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- drivers/gpu/nvgpu/common/vgpu/{ => gr}/fecs_trace_vgpu.c | 2 +- drivers/gpu/nvgpu/common/vgpu/{ => gr}/fecs_trace_vgpu.h | 0 drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- drivers/gpu/nvgpu/common/vgpu/vgpu.c | 2 +- drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu_linux.c | 2 +- drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename drivers/gpu/nvgpu/common/vgpu/{ => gr}/fecs_trace_vgpu.c (99%) rename drivers/gpu/nvgpu/common/vgpu/{ => gr}/fecs_trace_vgpu.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index b8d9b652d..38c3222c9 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -454,7 +454,7 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ common/vgpu/perf/perf_vgpu.o \ common/vgpu/ecc_vgpu.o \ common/vgpu/clk_vgpu.o \ - common/vgpu/fecs_trace_vgpu.o \ + common/vgpu/gr/fecs_trace_vgpu.o \ common/vgpu/gp10b/vgpu_hal_gp10b.o \ common/vgpu/gv11b/vgpu_gv11b.o \ common/vgpu/gv11b/vgpu_hal_gv11b.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 0fccc86d8..2375dcc57 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -297,7 +297,7 @@ srcs += common/sim.c \ common/vgpu/tsg_vgpu.c \ common/vgpu/perf/cyclestats_snapshot_vgpu.c \ common/vgpu/perf/perf_vgpu.c \ - common/vgpu/fecs_trace_vgpu.c \ + common/vgpu/gr/fecs_trace_vgpu.c \ common/vgpu/mm/mm_vgpu.c \ common/vgpu/mm/vm_vgpu.c \ common/vgpu/gr/gr_vgpu.c \ diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c index 99212341f..b1fd94c6d 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -55,7 +55,7 @@ #include "common/vgpu/mm/mm_vgpu.h" #include "common/vgpu/cbc/cbc_vgpu.h" #include "common/vgpu/debugger_vgpu.h" -#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/gr/fecs_trace_vgpu.h" #include "common/vgpu/perf/perf_vgpu.h" #include "common/vgpu/perf/cyclestats_snapshot_vgpu.h" #include "gp10b/gp10b.h" diff --git a/drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/gr/fecs_trace_vgpu.c similarity index 99% rename from drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.c rename to drivers/gpu/nvgpu/common/vgpu/gr/fecs_trace_vgpu.c index 525cccc2c..a75f246c3 100644 --- a/drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/gr/fecs_trace_vgpu.c @@ -30,7 +30,7 @@ #include #include -#include "common/vgpu/fecs_trace_vgpu.h" +#include "fecs_trace_vgpu.h" int vgpu_fecs_trace_init(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/gr/fecs_trace_vgpu.h similarity index 100% rename from drivers/gpu/nvgpu/common/vgpu/fecs_trace_vgpu.h rename to drivers/gpu/nvgpu/common/vgpu/gr/fecs_trace_vgpu.h diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c index 879d732e1..ee58bcc08 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -69,7 +69,7 @@ #include "common/vgpu/cbc/cbc_vgpu.h" #include "common/vgpu/debugger_vgpu.h" #include "common/vgpu/perf/perf_vgpu.h" -#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/gr/fecs_trace_vgpu.h" #include "common/vgpu/perf/cyclestats_snapshot_vgpu.h" #include "common/vgpu/fifo/vgpu_fifo_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/vgpu/vgpu.c b/drivers/gpu/nvgpu/common/vgpu/vgpu.c index fe7314295..3d85b398e 100644 --- a/drivers/gpu/nvgpu/common/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/common/vgpu/vgpu.c @@ -33,7 +33,7 @@ #include #include -#include "fecs_trace_vgpu.h" +#include "common/vgpu/gr/fecs_trace_vgpu.h" int vgpu_comm_init(struct gk20a *g) { 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 eb6c1f2c8..09c89df6f 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 @@ -21,7 +21,7 @@ #include -#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/gr/fecs_trace_vgpu.h" void vgpu_fecs_trace_data_update(struct gk20a *g) { diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index e91804732..e90b1f625 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -36,7 +36,7 @@ #include #include "vgpu_linux.h" -#include "common/vgpu/fecs_trace_vgpu.h" +#include "common/vgpu/gr/fecs_trace_vgpu.h" #include "common/vgpu/clk_vgpu.h" #include "gm20b/hal_gm20b.h"