diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h | 30 |
2 files changed, 26 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index e738b1d2..a6d953a4 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -126,4 +126,5 @@ void gm20b_init_fifo(struct gpu_ops *gops) | |||
126 | gops->fifo.get_pbdma_signature = gk20a_fifo_get_pbdma_signature; | 126 | gops->fifo.get_pbdma_signature = gk20a_fifo_get_pbdma_signature; |
127 | gops->fifo.set_runlist_interleave = gk20a_fifo_set_runlist_interleave; | 127 | gops->fifo.set_runlist_interleave = gk20a_fifo_set_runlist_interleave; |
128 | gops->fifo.force_reset_ch = gk20a_fifo_force_reset_ch; | 128 | gops->fifo.force_reset_ch = gk20a_fifo_force_reset_ch; |
129 | gops->fifo.engine_enum_from_type = gk20a_fifo_engine_enum_from_type; | ||
129 | } | 130 | } |
diff --git a/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h index c0ad007d..b0cf6579 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2016, 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, |
@@ -138,13 +138,29 @@ static inline u32 top_device_info_type_enum_graphics_f(void) | |||
138 | { | 138 | { |
139 | return 0x0; | 139 | return 0x0; |
140 | } | 140 | } |
141 | static inline u32 top_device_info_type_enum_copy0_v(void) | 141 | static inline u32 top_device_info_type_enum_copy2_v(void) |
142 | { | 142 | { |
143 | return 0x00000001; | 143 | return 0x00000003; |
144 | } | ||
145 | static inline u32 top_device_info_type_enum_copy2_f(void) | ||
146 | { | ||
147 | return 0xc; | ||
144 | } | 148 | } |
145 | static inline u32 top_device_info_type_enum_copy0_f(void) | 149 | static inline u32 top_device_info_engine_v(u32 r) |
146 | { | 150 | { |
147 | return 0x4; | 151 | return (r >> 5) & 0x1; |
152 | } | ||
153 | static inline u32 top_device_info_runlist_v(u32 r) | ||
154 | { | ||
155 | return (r >> 4) & 0x1; | ||
156 | } | ||
157 | static inline u32 top_device_info_intr_v(u32 r) | ||
158 | { | ||
159 | return (r >> 3) & 0x1; | ||
160 | } | ||
161 | static inline u32 top_device_info_reset_v(u32 r) | ||
162 | { | ||
163 | return (r >> 2) & 0x1; | ||
148 | } | 164 | } |
149 | static inline u32 top_device_info_entry_v(u32 r) | 165 | static inline u32 top_device_info_entry_v(u32 r) |
150 | { | 166 | { |
@@ -158,4 +174,8 @@ static inline u32 top_device_info_entry_enum_v(void) | |||
158 | { | 174 | { |
159 | return 0x00000002; | 175 | return 0x00000002; |
160 | } | 176 | } |
177 | static inline u32 top_device_info_entry_engine_type_v(void) | ||
178 | { | ||
179 | return 0x00000003; | ||
180 | } | ||
161 | #endif | 181 | #endif |