diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-04-17 13:50:54 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-18 13:24:54 -0400 |
commit | 1d4b22ed88d2764b4708d27cbabcfbbdf9d04ba2 (patch) | |
tree | 033d8eff8a70bee0735f88143332ba51022d221d /drivers/gpu/nvgpu/include | |
parent | 6dabea9882ee965041cf42c95e8b2bcff95fbfa0 (diff) |
gpu: nvgpu: gv11b: set soc credits after fs_hub is out of reset
Without these credits, gpu mmu binds over nvlink to soc are hanging.
Also add l2_enabled for mc_elpg_enable.
Bug 1899460
Change-Id: I0b26410d5c8ec9b4c88b319ddd9442f2fd91b321
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1463204
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h | 6 |
2 files changed, 25 insertions, 1 deletions
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 dbcb02c8..bd2f628c 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 | |||
@@ -630,4 +630,24 @@ static inline u32 fifo_cfg0_pbdma_fault_id_v(u32 r) | |||
630 | { | 630 | { |
631 | return (r >> 16) & 0xff; | 631 | return (r >> 16) & 0xff; |
632 | } | 632 | } |
633 | static inline u32 fifo_fb_iface_r(void) | ||
634 | { | ||
635 | return 0x000026f0; | ||
636 | } | ||
637 | static inline u32 fifo_fb_iface_control_v(u32 r) | ||
638 | { | ||
639 | return (r >> 0) & 0x1; | ||
640 | } | ||
641 | static inline u32 fifo_fb_iface_control_enable_f(void) | ||
642 | { | ||
643 | return 0x1; | ||
644 | } | ||
645 | static inline u32 fifo_fb_iface_status_v(u32 r) | ||
646 | { | ||
647 | return (r >> 4) & 0x1; | ||
648 | } | ||
649 | static inline u32 fifo_fb_iface_status_enabled_f(void) | ||
650 | { | ||
651 | return 0x10; | ||
652 | } | ||
633 | #endif | 653 | #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 98bec43a..f05910a9 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, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, 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, |
@@ -242,4 +242,8 @@ static inline u32 mc_elpg_enable_hub_enabled_f(void) | |||
242 | { | 242 | { |
243 | return 0x20000000; | 243 | return 0x20000000; |
244 | } | 244 | } |
245 | static inline u32 mc_elpg_enable_l2_enabled_f(void) | ||
246 | { | ||
247 | return 0x8; | ||
248 | } | ||
245 | #endif | 249 | #endif |