diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2015-01-13 13:26:14 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-04-04 21:03:11 -0400 |
commit | 0079e5b015c71c889ca6339d7c9f384e1de7d409 (patch) | |
tree | d1d1d49cc392e44eb511526400687fa42d5b3228 | |
parent | 64039b3ae04229ea0642141bf9299dc1ead7a3aa (diff) |
gpu: nvgpu: Update gk20a and gm20b headers
Update gk20a and gm20b headers with bar2 register block
registers. Also updated gm20b ctxsw headers with latest
tool output.
Bug 1587825
Change-Id: I9d1c459e03051278e7e79806803aaf71655f0dc5
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/672124
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h | 22 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h | 22 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h | 2 |
3 files changed, 43 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h index ebf8a873..44ef9424 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2012-2015, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -66,10 +66,30 @@ static inline u32 bus_bar1_block_mode_virtual_f(void) | |||
66 | { | 66 | { |
67 | return 0x80000000; | 67 | return 0x80000000; |
68 | } | 68 | } |
69 | static inline u32 bus_bar2_block_r(void) | ||
70 | { | ||
71 | return 0x00001714; | ||
72 | } | ||
73 | static inline u32 bus_bar2_block_ptr_f(u32 v) | ||
74 | { | ||
75 | return (v & 0xfffffff) << 0; | ||
76 | } | ||
77 | static inline u32 bus_bar2_block_target_vid_mem_f(void) | ||
78 | { | ||
79 | return 0x0; | ||
80 | } | ||
81 | static inline u32 bus_bar2_block_mode_virtual_f(void) | ||
82 | { | ||
83 | return 0x80000000; | ||
84 | } | ||
69 | static inline u32 bus_bar1_block_ptr_shift_v(void) | 85 | static inline u32 bus_bar1_block_ptr_shift_v(void) |
70 | { | 86 | { |
71 | return 0x0000000c; | 87 | return 0x0000000c; |
72 | } | 88 | } |
89 | static inline u32 bus_bar2_block_ptr_shift_v(void) | ||
90 | { | ||
91 | return 0x0000000c; | ||
92 | } | ||
73 | static inline u32 bus_intr_0_r(void) | 93 | static inline u32 bus_intr_0_r(void) |
74 | { | 94 | { |
75 | return 0x00001100; | 95 | return 0x00001100; |
diff --git a/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h index 800165fc..004f8e1e 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -66,10 +66,30 @@ static inline u32 bus_bar1_block_mode_virtual_f(void) | |||
66 | { | 66 | { |
67 | return 0x80000000; | 67 | return 0x80000000; |
68 | } | 68 | } |
69 | static inline u32 bus_bar2_block_r(void) | ||
70 | { | ||
71 | return 0x00001714; | ||
72 | } | ||
73 | static inline u32 bus_bar2_block_ptr_f(u32 v) | ||
74 | { | ||
75 | return (v & 0xfffffff) << 0; | ||
76 | } | ||
77 | static inline u32 bus_bar2_block_target_vid_mem_f(void) | ||
78 | { | ||
79 | return 0x0; | ||
80 | } | ||
81 | static inline u32 bus_bar2_block_mode_virtual_f(void) | ||
82 | { | ||
83 | return 0x80000000; | ||
84 | } | ||
69 | static inline u32 bus_bar1_block_ptr_shift_v(void) | 85 | static inline u32 bus_bar1_block_ptr_shift_v(void) |
70 | { | 86 | { |
71 | return 0x0000000c; | 87 | return 0x0000000c; |
72 | } | 88 | } |
89 | static inline u32 bus_bar2_block_ptr_shift_v(void) | ||
90 | { | ||
91 | return 0x0000000c; | ||
92 | } | ||
73 | static inline u32 bus_intr_0_r(void) | 93 | static inline u32 bus_intr_0_r(void) |
74 | { | 94 | { |
75 | return 0x00001100; | 95 | return 0x00001100; |
diff --git a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h index e8675bea..ec44e9fb 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |