summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h22
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_bus_gm20b.h22
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h2
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}
69static inline u32 bus_bar2_block_r(void)
70{
71 return 0x00001714;
72}
73static inline u32 bus_bar2_block_ptr_f(u32 v)
74{
75 return (v & 0xfffffff) << 0;
76}
77static inline u32 bus_bar2_block_target_vid_mem_f(void)
78{
79 return 0x0;
80}
81static inline u32 bus_bar2_block_mode_virtual_f(void)
82{
83 return 0x80000000;
84}
69static inline u32 bus_bar1_block_ptr_shift_v(void) 85static inline u32 bus_bar1_block_ptr_shift_v(void)
70{ 86{
71 return 0x0000000c; 87 return 0x0000000c;
72} 88}
89static inline u32 bus_bar2_block_ptr_shift_v(void)
90{
91 return 0x0000000c;
92}
73static inline u32 bus_intr_0_r(void) 93static 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}
69static inline u32 bus_bar2_block_r(void)
70{
71 return 0x00001714;
72}
73static inline u32 bus_bar2_block_ptr_f(u32 v)
74{
75 return (v & 0xfffffff) << 0;
76}
77static inline u32 bus_bar2_block_target_vid_mem_f(void)
78{
79 return 0x0;
80}
81static inline u32 bus_bar2_block_mode_virtual_f(void)
82{
83 return 0x80000000;
84}
69static inline u32 bus_bar1_block_ptr_shift_v(void) 85static inline u32 bus_bar1_block_ptr_shift_v(void)
70{ 86{
71 return 0x0000000c; 87 return 0x0000000c;
72} 88}
89static inline u32 bus_bar2_block_ptr_shift_v(void)
90{
91 return 0x0000000c;
92}
73static inline u32 bus_intr_0_r(void) 93static 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,