From 40561a17ea6864a5fa50043e93b7063857bec4a2 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Wed, 10 Apr 2019 14:48:51 -0700 Subject: [PATCH] gpu: nvgpu: remove fifo_gp10b.h Delete fifo_gp10b.h JIRA NVGPU-2950 Change-Id: Ia4abc4b3e9cb5fc16fbe40a0d008a602434a2e3d Signed-off-by: Seema Khowala Reviewed-on: https://git-master.nvidia.com/r/2094656 Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c | 1 - .../nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 1 - drivers/gpu/nvgpu/gp10b/fifo_gp10b.h | 35 ------------------- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 1 - drivers/gpu/nvgpu/gv100/hal_gv100.c | 1 - drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 -- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 1 - drivers/gpu/nvgpu/tu104/fifo_tu104.c | 2 -- drivers/gpu/nvgpu/tu104/hal_tu104.c | 1 - 9 files changed, 45 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gp10b/fifo_gp10b.h 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 252226d4f..ed5567428 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -76,7 +76,6 @@ #include "gp10b/mm_gp10b.h" #include "gp10b/ce_gp10b.h" #include "gp10b/gr_gp10b.h" -#include "gp10b/fifo_gp10b.h" #include "gm20b/gr_gm20b.h" #include "gm20b/mm_gm20b.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 09bea6835..ec2b123f0 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -94,7 +94,6 @@ #include #include #include "gp10b/gr_gp10b.h" -#include #include #include diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h deleted file mode 100644 index 7c34f59a4..000000000 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * GP10B Fifo - * - * Copyright (c) 2014-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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef FIFO_GP10B_H -#define FIFO_GP10B_H - -struct gk20a; -struct fifo_gk20a; - -void gp10b_device_info_data_parse(struct gk20a *g, u32 table_entry, - u32 *inst_id, u32 *pri_base, u32 *fault_id); -void gp10b_fifo_init_pbdma_intr_descs(struct fifo_gk20a *f); - -#endif diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 88e1ede43..2b87cdf94 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -121,7 +121,6 @@ #include "gp10b/gr_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gp10b/ce_gp10b.h" -#include "gp10b/fifo_gp10b.h" #include "gp10b/ecc_gp10b.h" #include "gm20b/gr_gm20b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index b1a2085f2..c70653d56 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -141,7 +141,6 @@ #include "gp10b/gr_gp10b.h" #include "gp10b/ce_gp10b.h" -#include "gp10b/fifo_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gv11b/hal_gv11b.h" diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index daa7ee8e6..7e128fd37 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c @@ -54,8 +54,6 @@ #include "gk20a/fifo_gk20a.h" -#include "gp10b/fifo_gp10b.h" - #include #include #include diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 873fd3e0e..ade33bbbc 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -125,7 +125,6 @@ #include "gm20b/mm_gm20b.h" #include "gp10b/ce_gp10b.h" -#include "gp10b/fifo_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gp10b/gr_gp10b.h" diff --git a/drivers/gpu/nvgpu/tu104/fifo_tu104.c b/drivers/gpu/nvgpu/tu104/fifo_tu104.c index 2a9549b61..a28b1ebd9 100644 --- a/drivers/gpu/nvgpu/tu104/fifo_tu104.c +++ b/drivers/gpu/nvgpu/tu104/fifo_tu104.c @@ -31,8 +31,6 @@ #include "gk20a/fifo_gk20a.h" -#include "gp10b/fifo_gp10b.h" - #include "gv11b/fifo_gv11b.h" #include "tu104/fifo_tu104.h" diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 302f4386b..bba91b8fa 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -154,7 +154,6 @@ #include "gp10b/gr_gp10b.h" #include "gp10b/ce_gp10b.h" -#include "gp10b/fifo_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gv11b/hal_gv11b.h"