diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-10-27 03:16:51 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:52 -0400 |
commit | 4739499f07b29282ee1031d08adaa76c238da2a6 (patch) | |
tree | 10caa152eea6250e46cad6172553069b4bb3dcb9 /drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h | |
parent | b5bb4f53dbdde8473e1160d4522c5d9da55f115f (diff) |
gpu: nvgpu: Sync gk20a and gm20b headers
Synchronize gk20a and gm20b headers. All registers which were added
to gk20a are now added to gm20b, and some registers that are unused
are removed.
Bug 1567274
Change-Id: Ia3b7958c148e495cbff420ee56bb448db0f58680
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/590313
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h index c64184cb..7b25d4af 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_pbdma_gm20b.h | |||
@@ -174,6 +174,10 @@ static inline u32 pbdma_pb_header_type_inc_f(void) | |||
174 | { | 174 | { |
175 | return 0x20000000; | 175 | return 0x20000000; |
176 | } | 176 | } |
177 | static inline u32 pbdma_hdr_shadow_r(u32 i) | ||
178 | { | ||
179 | return 0x00040118 + i*8192; | ||
180 | } | ||
177 | static inline u32 pbdma_subdevice_r(u32 i) | 181 | static inline u32 pbdma_subdevice_r(u32 i) |
178 | { | 182 | { |
179 | return 0x00040094 + i*8192; | 183 | return 0x00040094 + i*8192; |
@@ -466,4 +470,20 @@ static inline u32 pbdma_syncpointb_syncpt_index_v(u32 r) | |||
466 | { | 470 | { |
467 | return (r >> 8) & 0xff; | 471 | return (r >> 8) & 0xff; |
468 | } | 472 | } |
473 | static inline u32 pbdma_runlist_timeslice_r(u32 i) | ||
474 | { | ||
475 | return 0x000400f8 + i*8192; | ||
476 | } | ||
477 | static inline u32 pbdma_runlist_timeslice_timeout_128_f(void) | ||
478 | { | ||
479 | return 0x80; | ||
480 | } | ||
481 | static inline u32 pbdma_runlist_timeslice_timescale_3_f(void) | ||
482 | { | ||
483 | return 0x3000; | ||
484 | } | ||
485 | static inline u32 pbdma_runlist_timeslice_enable_true_f(void) | ||
486 | { | ||
487 | return 0x10000000; | ||
488 | } | ||
469 | #endif | 489 | #endif |