summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Boonstoppel <pboonstoppel@nvidia.com>2017-02-08 17:44:55 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-02-14 17:54:41 -0500
commit4fb3161ba3bb1c8481b1ca426a44aa4ee3ad744e (patch)
treec194f52cf2874a66a384ac8d407e0f25efdd4ab8
parent28b0d6cfa80086d7c437bbddc77777d1dafa260c (diff)
gpu: nvgpu: Pull latest gp10b headers
HWCL 38000754 Bug 1819874 Change-Id: Ic28bd2abee4caac83c2d21b035a64558d72aa0fa Signed-off-by: Peter Boonstoppel <pboonstoppel@nvidia.com> Reviewed-on: http://git-master/r/1301674 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h10
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h4
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h14
3 files changed, 24 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h
index eef9a96f..9048f230 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2014-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,
@@ -258,6 +258,14 @@ static inline u32 ctxsw_prog_main_image_misc_options_verif_features_disabled_f(v
258{ 258{
259 return 0x0; 259 return 0x0;
260} 260}
261static inline u32 ctxsw_prog_main_image_pmu_options_o(void)
262{
263 return 0x00000070;
264}
265static inline u32 ctxsw_prog_main_image_pmu_options_boost_clock_frequencies_f(u32 v)
266{
267 return (v & 0x1) << 0;
268}
261static inline u32 ctxsw_prog_main_image_graphics_preemption_options_o(void) 269static inline u32 ctxsw_prog_main_image_graphics_preemption_options_o(void)
262{ 270{
263 return 0x00000080; 271 return 0x00000080;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h
index 2b1acf2f..76428c44 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2014-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,
@@ -124,7 +124,7 @@ static inline u32 fuse_status_opt_fbp_r(void)
124} 124}
125static inline u32 fuse_status_opt_fbp_idx_v(u32 r, u32 i) 125static inline u32 fuse_status_opt_fbp_idx_v(u32 r, u32 i)
126{ 126{
127 return (r >> (0 + i*0)) & 0x1; 127 return (r >> (0 + i*1)) & 0x1;
128} 128}
129static inline u32 fuse_opt_ecc_en_r(void) 129static inline u32 fuse_opt_ecc_en_r(void)
130{ 130{
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
index 9e3137e7..6bef30e0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2014-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,
@@ -2534,6 +2534,18 @@ static inline u32 gr_gpcs_tpcs_tex_rm_cb_1_valid_true_f(void)
2534{ 2534{
2535 return 0x80000000; 2535 return 0x80000000;
2536} 2536}
2537static inline u32 gr_gpcs_tpcs_tex_m_dbg2_r(void)
2538{
2539 return 0x00419a3c;
2540}
2541static inline u32 gr_gpcs_tpcs_tex_m_dbg2_lg_rd_coalesce_en_f(u32 v)
2542{
2543 return (v & 0x1) << 2;
2544}
2545static inline u32 gr_gpcs_tpcs_tex_m_dbg2_lg_rd_coalesce_en_m(void)
2546{
2547 return 0x1 << 2;
2548}
2537static inline u32 gr_gpccs_falcon_addr_r(void) 2549static inline u32 gr_gpccs_falcon_addr_r(void)
2538{ 2550{
2539 return 0x0041a0ac; 2551 return 0x0041a0ac;