summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2017-06-27 19:47:54 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-30 01:34:36 -0400
commit0a77330ac77d50d637492f591262a36bf48f2e5e (patch)
tree47fd55a53ede707fb8e0523175f167553f135abc /drivers
parent7d584bf868e53638f5c05b588dcd307e71cf9c82 (diff)
gpu: nvgpu: add fifo_t19x and channel_base
- add fifo_t19x to fifo_gk20a - add channel_base to fifo_gk20a It'll make kick off code re-usable by vgpu. Jira VFND-3796 Change-Id: I7f7607d3682f2eaad903e1690d83c1d78eba8052 Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: https://git-master/r/1510456 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Aingara Paramakuru <aparamakuru@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
index 6537b00f..09f0c95f 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
@@ -24,6 +24,10 @@
24#include "channel_gk20a.h" 24#include "channel_gk20a.h"
25#include "tsg_gk20a.h" 25#include "tsg_gk20a.h"
26 26
27#ifdef CONFIG_TEGRA_19x_GPU
28#include "fifo_t19x.h"
29#endif
30
27#include <nvgpu/kref.h> 31#include <nvgpu/kref.h>
28 32
29struct gk20a_debug_output; 33struct gk20a_debug_output;
@@ -194,6 +198,11 @@ struct fifo_gk20a {
194 unsigned long deferred_fault_engines; 198 unsigned long deferred_fault_engines;
195 bool deferred_reset_pending; 199 bool deferred_reset_pending;
196 struct nvgpu_mutex deferred_reset_mutex; 200 struct nvgpu_mutex deferred_reset_mutex;
201
202#ifdef CONFIG_TEGRA_19x_GPU
203 struct fifo_t19x t19x;
204#endif
205 u32 channel_base;
197}; 206};
198 207
199static inline const char *gk20a_fifo_interleave_level_name(u32 interleave_level) 208static inline const char *gk20a_fifo_interleave_level_name(u32 interleave_level)