From 509fd2c93a4168839be4f4aa3dad72a655b6e27d Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Fri, 19 Apr 2019 11:08:42 -0700 Subject: [PATCH] gpu: nvgpu: rename fifo_gv100.[ch] Rename fifo_gv100.[ch] -> hal/fifo/fifo_intr_gv100.[ch] JIRA NVGPU-3144 Change-Id: I0add5ac7889ba98d5cf53f939f704faf92aa20eb Signed-off-by: Seema Khowala Reviewed-on: https://git-master.nvidia.com/r/2101278 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 2 +- drivers/gpu/nvgpu/Makefile.sources | 2 +- .../{gv100/fifo_gv100.c => hal/fifo/fifo_intr_gv100.c} | 6 ++---- .../{gv100/fifo_gv100.h => hal/fifo/fifo_intr_gv100.h} | 9 ++++----- drivers/gpu/nvgpu/hal/init/hal_gv100.c | 2 +- drivers/gpu/nvgpu/hal/init/hal_tu104.c | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) rename drivers/gpu/nvgpu/{gv100/fifo_gv100.c => hal/fifo/fifo_intr_gv100.c} (95%) rename drivers/gpu/nvgpu/{gv100/fifo_gv100.h => hal/fifo/fifo_intr_gv100.h} (92%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 788822b78..1ea8e5fb9 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -279,6 +279,7 @@ nvgpu-y += \ hal/fifo/userd_gk20a.o \ hal/fifo/userd_gv11b.o \ hal/fifo/fifo_intr_gk20a.o \ + hal/fifo/fifo_intr_gv100.o \ hal/fifo/fifo_intr_gv11b.o \ hal/fifo/mmu_fault_gk20a.o \ hal/fifo/mmu_fault_gm20b.o \ @@ -564,7 +565,6 @@ nvgpu-y += \ gv11b/mm_gv11b.o \ gv100/mm_gv100.o \ gv100/bios_gv100.o \ - gv100/fifo_gv100.o \ gv100/gr_gv100.o \ tu104/mm_tu104.o \ tu104/fifo_tu104.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index fda73990e..416101e27 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -254,7 +254,6 @@ srcs += common/sim/sim.c \ gp106/bios_gp106.c \ gv100/mm_gv100.c \ gv100/bios_gv100.c \ - gv100/fifo_gv100.c \ gv100/gr_gv100.c \ tu104/bios_tu104.c \ tu104/fbpa_tu104.c \ @@ -391,6 +390,7 @@ srcs += common/sim/sim.c \ hal/fifo/userd_gk20a.c \ hal/fifo/userd_gv11b.c \ hal/fifo/fifo_intr_gk20a.c \ + hal/fifo/fifo_intr_gv100.c \ hal/fifo/fifo_intr_gv11b.c \ hal/fifo/mmu_fault_gk20a.c \ hal/fifo/mmu_fault_gm20b.c \ diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gv100.c similarity index 95% rename from drivers/gpu/nvgpu/gv100/fifo_gv100.c rename to drivers/gpu/nvgpu/hal/fifo/fifo_intr_gv100.c index 8d2382191..93acb805e 100644 --- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c +++ b/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gv100.c @@ -1,6 +1,4 @@ /* - * GV100 fifo - * * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -27,9 +25,9 @@ #include #include -#include "fifo_gv100.h" +#include "fifo_intr_gv100.h" -#include +#include void gv100_fifo_intr_set_recover_mask(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.h b/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gv100.h similarity index 92% rename from drivers/gpu/nvgpu/gv100/fifo_gv100.h rename to drivers/gpu/nvgpu/hal/fifo/fifo_intr_gv100.h index eb9a21694..983715d97 100644 --- a/drivers/gpu/nvgpu/gv100/fifo_gv100.h +++ b/drivers/gpu/nvgpu/hal/fifo/fifo_intr_gv100.h @@ -1,6 +1,4 @@ /* - * GV100 Fifo - * * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -22,12 +20,13 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef FIFO_GV100_H -#define FIFO_GV100_H +#ifndef NVGPU_FIFO_INTR_GV100_H +#define NVGPU_FIFO_INTR_GV100_H #include struct gk20a; void gv100_fifo_intr_set_recover_mask(struct gk20a *g); void gv100_fifo_intr_unset_recover_mask(struct gk20a *g); -#endif + +#endif /* NVGPU_FIFO_INTR_GV100_H */ diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c index ddbee2844..a3ef14158 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c @@ -80,6 +80,7 @@ #include "hal/fifo/userd_gv11b.h" #include "hal/fifo/usermode_gv11b.h" #include "hal/fifo/fifo_intr_gk20a.h" +#include "hal/fifo/fifo_intr_gv100.h" #include "hal/fifo/fifo_intr_gv11b.h" #include "hal/fifo/ctxsw_timeout_gk20a.h" #include "hal/gr/fecs_trace/fecs_trace_gm20b.h" @@ -146,7 +147,6 @@ #include "hal_gv100.h" #include "gv100/bios_gv100.h" -#include "gv100/fifo_gv100.h" #include "gv100/gr_gv100.h" #include "gv100/mm_gv100.h" #include "hal/clk/clk_gv100.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index 55ea166a7..d8b0593e0 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -83,6 +83,7 @@ #include "hal/fifo/userd_gk20a.h" #include "hal/fifo/userd_gv11b.h" #include "hal/fifo/fifo_intr_gk20a.h" +#include "hal/fifo/fifo_intr_gv100.h" #include "hal/fifo/fifo_intr_gv11b.h" #include "hal/fifo/ctxsw_timeout_gv11b.h" #include "hal/gr/ecc/ecc_tu104.h" @@ -158,7 +159,6 @@ #include "gv11b/mm_gv11b.h" #include "gv11b/fifo_gv11b.h" -#include "gv100/fifo_gv100.h" #include "gv100/gr_gv100.h" #include "tu104/mm_tu104.h"