From 865514be2dbd36b65c3ac128724036ea0ce63321 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Fri, 28 Oct 2016 17:41:27 -0700 Subject: gpu: nvgpu: Move gp10b HW headers Move the gp10b HW headers to a new directory specially for them: include/nvgpu/hw/gp10b And change the code to include like so: #include This is part of the process to restructure the nvgpu driver. Bug 1799159 Change-Id: Ic80ea5b7f5c280839e502e2178a345181f7a7ef9 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1280326 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/fifo_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 40bfa2a5..d5c5327f 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c @@ -16,14 +16,16 @@ #include #include +#include "fifo_gp10b.h" + #include "gk20a/gk20a.h" #include "gm20b/fifo_gm20b.h" -#include "hw_pbdma_gp10b.h" -#include "fifo_gp10b.h" -#include "hw_ccsr_gp10b.h" -#include "hw_fifo_gp10b.h" -#include "hw_ram_gp10b.h" -#include "hw_top_gp10b.h" + +#include +#include +#include +#include +#include static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g, struct mem_desc *mem) @@ -145,7 +147,7 @@ static int channel_gp10b_setup_ramfc(struct channel_gk20a *c, static u32 gp10b_fifo_get_pbdma_signature(struct gk20a *g) { - return g->gpu_characteristics.gpfifo_class + return g->gpu_characteristics.gpfifo_class | pbdma_signature_sw_zero_f(); } -- cgit v1.2.2