From 609260d3d6c50045703ef3fea49ef414e6d58e82 Mon Sep 17 00:00:00 2001
From: Seema Khowala <seemaj@nvidia.com>
Date: Wed, 28 Dec 2016 11:11:12 -0800
Subject: gpu: nvgpu: gv11b: hw header update for CL37750038

Change-Id: I7ca3d9968dc37b6514a08d3f49b6d2353e11671d
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1277786
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h | 124 --------------------------------
 drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h   |   6 +-
 2 files changed, 3 insertions(+), 127 deletions(-)

(limited to 'drivers/gpu')

diff --git a/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h
index 8ea2e06a..d3e82e55 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/hw_fifo_gv11b.h
@@ -502,128 +502,4 @@ static inline u32 fifo_pbdma_status_chsw_in_progress_v(void)
 {
 	return 0x00000001;
 }
-static inline u32 fifo_replay_fault_buffer_lo_r(void)
-{
-	return 0x00002a70;
-}
-static inline u32 fifo_replay_fault_buffer_lo_enable_v(u32 r)
-{
-	return (r >> 0) & 0x1;
-}
-static inline u32 fifo_replay_fault_buffer_lo_enable_true_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 fifo_replay_fault_buffer_lo_enable_false_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_lo_base_f(u32 v)
-{
-	return (v & 0xfffff) << 12;
-}
-static inline u32 fifo_replay_fault_buffer_lo_base_reset_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_hi_r(void)
-{
-	return 0x00002a74;
-}
-static inline u32 fifo_replay_fault_buffer_hi_base_f(u32 v)
-{
-	return (v & 0xff) << 0;
-}
-static inline u32 fifo_replay_fault_buffer_hi_base_reset_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_size_r(void)
-{
-	return 0x00002a78;
-}
-static inline u32 fifo_replay_fault_buffer_size_hw_f(u32 v)
-{
-	return (v & 0x3ff) << 0;
-}
-static inline u32 fifo_replay_fault_buffer_size_hw_entries_v(void)
-{
-	return 0x00000140;
-}
-static inline u32 fifo_replay_fault_buffer_get_r(void)
-{
-	return 0x00002a7c;
-}
-static inline u32 fifo_replay_fault_buffer_get_offset_hw_f(u32 v)
-{
-	return (v & 0x3ff) << 0;
-}
-static inline u32 fifo_replay_fault_buffer_get_offset_hw_init_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_put_r(void)
-{
-	return 0x00002a80;
-}
-static inline u32 fifo_replay_fault_buffer_put_offset_hw_f(u32 v)
-{
-	return (v & 0x3ff) << 0;
-}
-static inline u32 fifo_replay_fault_buffer_put_offset_hw_init_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_info_r(void)
-{
-	return 0x00002a84;
-}
-static inline u32 fifo_replay_fault_buffer_info_overflow_f(u32 v)
-{
-	return (v & 0x1) << 0;
-}
-static inline u32 fifo_replay_fault_buffer_info_overflow_false_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_info_overflow_true_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 fifo_replay_fault_buffer_info_overflow_clear_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 fifo_replay_fault_buffer_info_write_nack_f(u32 v)
-{
-	return (v & 0x1) << 24;
-}
-static inline u32 fifo_replay_fault_buffer_info_write_nack_false_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_info_write_nack_true_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 fifo_replay_fault_buffer_info_write_nack_clear_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 fifo_replay_fault_buffer_info_fault_while_buffer_disabled_f(u32 v)
-{
-	return (v & 0x1) << 28;
-}
-static inline u32 fifo_replay_fault_buffer_info_fault_while_buffer_disabled_false_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 fifo_replay_fault_buffer_info_fault_while_buffer_disabled_true_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 fifo_replay_fault_buffer_info_fault_while_buffer_disabled_clear_v(void)
-{
-	return 0x00000001;
-}
 #endif
diff --git a/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h
index 02bb120b..99da5f73 100644
--- a/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/hw_gr_gv11b.h
@@ -2240,11 +2240,11 @@ static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_m(void)
 }
 static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_default_v(void)
 {
-	return 0x00000400;
+	return 0x00000800;
 }
 static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_gfxp_v(void)
 {
-	return 0x00000d00;
+	return 0x00001100;
 }
 static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_granularity_v(void)
 {
@@ -2288,7 +2288,7 @@ static inline u32 gr_gpc0_ppc0_cbm_beta_steady_state_cb_size_v_f(u32 v)
 }
 static inline u32 gr_gpc0_ppc0_cbm_beta_steady_state_cb_size_v_default_v(void)
 {
-	return 0x00000400;
+	return 0x00000800;
 }
 static inline u32 gr_gpcs_tpcs_tex_rm_cb_0_r(void)
 {
-- 
cgit v1.2.2