diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
6 files changed, 1 insertions, 89 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h index ac936181..4e9b590b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h | |||
@@ -528,24 +528,4 @@ static inline u32 fifo_cfg0_pbdma_fault_id_v(u32 r) | |||
528 | { | 528 | { |
529 | return (r >> 16U) & 0xffU; | 529 | return (r >> 16U) & 0xffU; |
530 | } | 530 | } |
531 | static inline u32 fifo_fb_iface_r(void) | ||
532 | { | ||
533 | return 0x000026f0U; | ||
534 | } | ||
535 | static inline u32 fifo_fb_iface_control_v(u32 r) | ||
536 | { | ||
537 | return (r >> 0U) & 0x1U; | ||
538 | } | ||
539 | static inline u32 fifo_fb_iface_control_enable_f(void) | ||
540 | { | ||
541 | return 0x1U; | ||
542 | } | ||
543 | static inline u32 fifo_fb_iface_status_v(u32 r) | ||
544 | { | ||
545 | return (r >> 4U) & 0x1U; | ||
546 | } | ||
547 | static inline u32 fifo_fb_iface_status_enabled_f(void) | ||
548 | { | ||
549 | return 0x10U; | ||
550 | } | ||
551 | #endif | 531 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h index fb558d2f..cf406c34 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_mc_gv100.h | |||
@@ -256,24 +256,4 @@ static inline u32 mc_enable_pb_sel_f(u32 v, u32 i) | |||
256 | { | 256 | { |
257 | return (v & 0x1U) << (0U + i*1U); | 257 | return (v & 0x1U) << (0U + i*1U); |
258 | } | 258 | } |
259 | static inline u32 mc_elpg_enable_r(void) | ||
260 | { | ||
261 | return 0x0000020cU; | ||
262 | } | ||
263 | static inline u32 mc_elpg_enable_xbar_enabled_f(void) | ||
264 | { | ||
265 | return 0x4U; | ||
266 | } | ||
267 | static inline u32 mc_elpg_enable_pfb_enabled_f(void) | ||
268 | { | ||
269 | return 0x100000U; | ||
270 | } | ||
271 | static inline u32 mc_elpg_enable_hub_enabled_f(void) | ||
272 | { | ||
273 | return 0x20000000U; | ||
274 | } | ||
275 | static inline u32 mc_elpg_enable_l2_enabled_f(void) | ||
276 | { | ||
277 | return 0x8U; | ||
278 | } | ||
279 | #endif | 259 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h index a5c8dad3..41d7d1b6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h | |||
@@ -336,10 +336,6 @@ static inline u32 pbdma_config_l2_evict_normal_f(void) | |||
336 | { | 336 | { |
337 | return 0x1U; | 337 | return 0x1U; |
338 | } | 338 | } |
339 | static inline u32 pbdma_config_l2_evict_last_f(void) | ||
340 | { | ||
341 | return 0x2U; | ||
342 | } | ||
343 | static inline u32 pbdma_config_ce_split_enable_f(void) | 339 | static inline u32 pbdma_config_ce_split_enable_f(void) |
344 | { | 340 | { |
345 | return 0x0U; | 341 | return 0x0U; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h index cb8bf611..9ec30bf9 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h | |||
@@ -664,24 +664,4 @@ static inline u32 fifo_cfg0_pbdma_fault_id_v(u32 r) | |||
664 | { | 664 | { |
665 | return (r >> 16U) & 0xffU; | 665 | return (r >> 16U) & 0xffU; |
666 | } | 666 | } |
667 | static inline u32 fifo_fb_iface_r(void) | ||
668 | { | ||
669 | return 0x000026f0U; | ||
670 | } | ||
671 | static inline u32 fifo_fb_iface_control_v(u32 r) | ||
672 | { | ||
673 | return (r >> 0U) & 0x1U; | ||
674 | } | ||
675 | static inline u32 fifo_fb_iface_control_enable_f(void) | ||
676 | { | ||
677 | return 0x1U; | ||
678 | } | ||
679 | static inline u32 fifo_fb_iface_status_v(u32 r) | ||
680 | { | ||
681 | return (r >> 4U) & 0x1U; | ||
682 | } | ||
683 | static inline u32 fifo_fb_iface_status_enabled_f(void) | ||
684 | { | ||
685 | return 0x10U; | ||
686 | } | ||
687 | #endif | 667 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h index bff73076..a1bf15bd 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -228,24 +228,4 @@ static inline u32 mc_enable_pb_sel_f(u32 v, u32 i) | |||
228 | { | 228 | { |
229 | return (v & 0x1U) << (0U + i*1U); | 229 | return (v & 0x1U) << (0U + i*1U); |
230 | } | 230 | } |
231 | static inline u32 mc_elpg_enable_r(void) | ||
232 | { | ||
233 | return 0x0000020cU; | ||
234 | } | ||
235 | static inline u32 mc_elpg_enable_xbar_enabled_f(void) | ||
236 | { | ||
237 | return 0x4U; | ||
238 | } | ||
239 | static inline u32 mc_elpg_enable_pfb_enabled_f(void) | ||
240 | { | ||
241 | return 0x100000U; | ||
242 | } | ||
243 | static inline u32 mc_elpg_enable_hub_enabled_f(void) | ||
244 | { | ||
245 | return 0x20000000U; | ||
246 | } | ||
247 | static inline u32 mc_elpg_enable_l2_enabled_f(void) | ||
248 | { | ||
249 | return 0x8U; | ||
250 | } | ||
251 | #endif | 231 | #endif |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h index 75bdae1c..c04d30a4 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h | |||
@@ -336,10 +336,6 @@ static inline u32 pbdma_config_l2_evict_normal_f(void) | |||
336 | { | 336 | { |
337 | return 0x1U; | 337 | return 0x1U; |
338 | } | 338 | } |
339 | static inline u32 pbdma_config_l2_evict_last_f(void) | ||
340 | { | ||
341 | return 0x2U; | ||
342 | } | ||
343 | static inline u32 pbdma_config_ce_split_enable_f(void) | 339 | static inline u32 pbdma_config_ce_split_enable_f(void) |
344 | { | 340 | { |
345 | return 0x0U; | 341 | return 0x0U; |