summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2016-10-28 20:41:27 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-11 15:44:14 -0500
commit865514be2dbd36b65c3ac128724036ea0ce63321 (patch)
tree9a2fccc3b71a8945923b0ed4910c4fec45fa4fec /drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
parent6dd57c29b064774e065b001266aef9dd37bc7feb (diff)
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 <nvgpu/hw/gp10b/hw_fb_gp10b.h> This is part of the process to restructure the nvgpu driver. Bug 1799159 Change-Id: Ic80ea5b7f5c280839e502e2178a345181f7a7ef9 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1280326 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/fifo_gp10b.c')
-rw-r--r--drivers/gpu/nvgpu/gp10b/fifo_gp10b.c16
1 files changed, 9 insertions, 7 deletions
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 @@
16#include <linux/delay.h> 16#include <linux/delay.h>
17#include <linux/types.h> 17#include <linux/types.h>
18 18
19#include "fifo_gp10b.h"
20
19#include "gk20a/gk20a.h" 21#include "gk20a/gk20a.h"
20#include "gm20b/fifo_gm20b.h" 22#include "gm20b/fifo_gm20b.h"
21#include "hw_pbdma_gp10b.h" 23
22#include "fifo_gp10b.h" 24#include <nvgpu/hw/gp10b/hw_pbdma_gp10b.h>
23#include "hw_ccsr_gp10b.h" 25#include <nvgpu/hw/gp10b/hw_ccsr_gp10b.h>
24#include "hw_fifo_gp10b.h" 26#include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
25#include "hw_ram_gp10b.h" 27#include <nvgpu/hw/gp10b/hw_ram_gp10b.h>
26#include "hw_top_gp10b.h" 28#include <nvgpu/hw/gp10b/hw_top_gp10b.h>
27 29
28static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g, 30static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g,
29 struct mem_desc *mem) 31 struct mem_desc *mem)
@@ -145,7 +147,7 @@ static int channel_gp10b_setup_ramfc(struct channel_gk20a *c,
145 147
146static u32 gp10b_fifo_get_pbdma_signature(struct gk20a *g) 148static u32 gp10b_fifo_get_pbdma_signature(struct gk20a *g)
147{ 149{
148 return g->gpu_characteristics.gpfifo_class 150 return g->gpu_characteristics.gpfifo_class
149 | pbdma_signature_sw_zero_f(); 151 | pbdma_signature_sw_zero_f();
150} 152}
151 153