diff options
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h | 54 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h | 24 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h | 32 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_trim_gp10b.h | 8 |
5 files changed, 65 insertions, 57 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h index 7a4761d6..03164957 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h | |||
@@ -1126,18 +1126,6 @@ static inline u32 gr_pd_ab_dist_cfg2_state_limit_min_gpm_fifo_depths_v(void) | |||
1126 | { | 1126 | { |
1127 | return 0x00000182; | 1127 | return 0x00000182; |
1128 | } | 1128 | } |
1129 | static inline u32 gr_pd_pagepool_r(void) | ||
1130 | { | ||
1131 | return 0x004064cc; | ||
1132 | } | ||
1133 | static inline u32 gr_pd_pagepool_total_pages_f(u32 v) | ||
1134 | { | ||
1135 | return (v & 0xff) << 0; | ||
1136 | } | ||
1137 | static inline u32 gr_pd_pagepool_valid_true_f(void) | ||
1138 | { | ||
1139 | return 0x80000000; | ||
1140 | } | ||
1141 | static inline u32 gr_pd_dist_skip_table_r(u32 i) | 1129 | static inline u32 gr_pd_dist_skip_table_r(u32 i) |
1142 | { | 1130 | { |
1143 | return 0x004064d0 + i*4; | 1131 | return 0x004064d0 + i*4; |
@@ -1302,6 +1290,18 @@ static inline u32 gr_ds_zbc_tbl_ld_trigger_active_f(void) | |||
1302 | { | 1290 | { |
1303 | return 0x4; | 1291 | return 0x4; |
1304 | } | 1292 | } |
1293 | static inline u32 gr_ds_tga_constraintlogic_r(void) | ||
1294 | { | ||
1295 | return 0xffffffff; | ||
1296 | } | ||
1297 | static inline u32 gr_ds_tga_constraintlogic_beta_cbsize_f(u32 v) | ||
1298 | { | ||
1299 | return (v & 0x1) << -1; | ||
1300 | } | ||
1301 | static inline u32 gr_ds_tga_constraintlogic_alpha_cbsize_f(u32 v) | ||
1302 | { | ||
1303 | return (v & 0x1) << -1; | ||
1304 | } | ||
1305 | static inline u32 gr_ds_hww_esr_r(void) | 1305 | static inline u32 gr_ds_hww_esr_r(void) |
1306 | { | 1306 | { |
1307 | return 0x00405840; | 1307 | return 0x00405840; |
@@ -1536,7 +1536,7 @@ static inline u32 gr_scc_pagepool_r(void) | |||
1536 | } | 1536 | } |
1537 | static inline u32 gr_scc_pagepool_total_pages_f(u32 v) | 1537 | static inline u32 gr_scc_pagepool_total_pages_f(u32 v) |
1538 | { | 1538 | { |
1539 | return (v & 0xff) << 0; | 1539 | return (v & 0x3ff) << 0; |
1540 | } | 1540 | } |
1541 | static inline u32 gr_scc_pagepool_total_pages_hwmax_v(void) | 1541 | static inline u32 gr_scc_pagepool_total_pages_hwmax_v(void) |
1542 | { | 1542 | { |
@@ -1544,7 +1544,7 @@ static inline u32 gr_scc_pagepool_total_pages_hwmax_v(void) | |||
1544 | } | 1544 | } |
1545 | static inline u32 gr_scc_pagepool_total_pages_hwmax_value_v(void) | 1545 | static inline u32 gr_scc_pagepool_total_pages_hwmax_value_v(void) |
1546 | { | 1546 | { |
1547 | return 0x00000080; | 1547 | return 0x00000200; |
1548 | } | 1548 | } |
1549 | static inline u32 gr_scc_pagepool_total_pages_byte_granularity_v(void) | 1549 | static inline u32 gr_scc_pagepool_total_pages_byte_granularity_v(void) |
1550 | { | 1550 | { |
@@ -1552,19 +1552,19 @@ static inline u32 gr_scc_pagepool_total_pages_byte_granularity_v(void) | |||
1552 | } | 1552 | } |
1553 | static inline u32 gr_scc_pagepool_max_valid_pages_s(void) | 1553 | static inline u32 gr_scc_pagepool_max_valid_pages_s(void) |
1554 | { | 1554 | { |
1555 | return 8; | 1555 | return 10; |
1556 | } | 1556 | } |
1557 | static inline u32 gr_scc_pagepool_max_valid_pages_f(u32 v) | 1557 | static inline u32 gr_scc_pagepool_max_valid_pages_f(u32 v) |
1558 | { | 1558 | { |
1559 | return (v & 0xff) << 8; | 1559 | return (v & 0x3ff) << 10; |
1560 | } | 1560 | } |
1561 | static inline u32 gr_scc_pagepool_max_valid_pages_m(void) | 1561 | static inline u32 gr_scc_pagepool_max_valid_pages_m(void) |
1562 | { | 1562 | { |
1563 | return 0xff << 8; | 1563 | return 0x3ff << 10; |
1564 | } | 1564 | } |
1565 | static inline u32 gr_scc_pagepool_max_valid_pages_v(u32 r) | 1565 | static inline u32 gr_scc_pagepool_max_valid_pages_v(u32 r) |
1566 | { | 1566 | { |
1567 | return (r >> 8) & 0xff; | 1567 | return (r >> 10) & 0x3ff; |
1568 | } | 1568 | } |
1569 | static inline u32 gr_scc_pagepool_valid_true_f(void) | 1569 | static inline u32 gr_scc_pagepool_valid_true_f(void) |
1570 | { | 1570 | { |
@@ -1788,7 +1788,7 @@ static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_m(void) | |||
1788 | } | 1788 | } |
1789 | static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_default_v(void) | 1789 | static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_default_v(void) |
1790 | { | 1790 | { |
1791 | return 0x00100000; | 1791 | return 0x00030000; |
1792 | } | 1792 | } |
1793 | static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_granularity_v(void) | 1793 | static inline u32 gr_gpc0_ppc0_cbm_beta_cb_size_v_granularity_v(void) |
1794 | { | 1794 | { |
@@ -2068,11 +2068,19 @@ static inline u32 gr_gpcs_swdx_tc_beta_cb_size_r(u32 i) | |||
2068 | } | 2068 | } |
2069 | static inline u32 gr_gpcs_swdx_tc_beta_cb_size_v_f(u32 v) | 2069 | static inline u32 gr_gpcs_swdx_tc_beta_cb_size_v_f(u32 v) |
2070 | { | 2070 | { |
2071 | return (v & 0x3fffff) << 0; | 2071 | return (v & 0xffffffff) << -1; |
2072 | } | 2072 | } |
2073 | static inline u32 gr_gpcs_swdx_tc_beta_cb_size_v_m(void) | 2073 | static inline u32 gr_gpcs_swdx_tc_beta_cb_size_v_m(void) |
2074 | { | 2074 | { |
2075 | return 0x3fffff << 0; | 2075 | return 0xffffffff << -1; |
2076 | } | ||
2077 | static inline u32 gr_gpcs_swdx_tc_beta_cb_size_div3_f(u32 v) | ||
2078 | { | ||
2079 | return (v & 0xffffffff) << -1; | ||
2080 | } | ||
2081 | static inline u32 gr_gpcs_swdx_tc_beta_cb_size_div3_m(void) | ||
2082 | { | ||
2083 | return 0xffffffff << -1; | ||
2076 | } | 2084 | } |
2077 | static inline u32 gr_gpcs_swdx_rm_pagepool_r(void) | 2085 | static inline u32 gr_gpcs_swdx_rm_pagepool_r(void) |
2078 | { | 2086 | { |
@@ -2080,7 +2088,7 @@ static inline u32 gr_gpcs_swdx_rm_pagepool_r(void) | |||
2080 | } | 2088 | } |
2081 | static inline u32 gr_gpcs_swdx_rm_pagepool_total_pages_f(u32 v) | 2089 | static inline u32 gr_gpcs_swdx_rm_pagepool_total_pages_f(u32 v) |
2082 | { | 2090 | { |
2083 | return (v & 0xff) << 0; | 2091 | return (v & 0x3ff) << 0; |
2084 | } | 2092 | } |
2085 | static inline u32 gr_gpcs_swdx_rm_pagepool_valid_true_f(void) | 2093 | static inline u32 gr_gpcs_swdx_rm_pagepool_valid_true_f(void) |
2086 | { | 2094 | { |
@@ -2464,7 +2472,7 @@ static inline u32 gr_gpcs_gcc_pagepool_r(void) | |||
2464 | } | 2472 | } |
2465 | static inline u32 gr_gpcs_gcc_pagepool_total_pages_f(u32 v) | 2473 | static inline u32 gr_gpcs_gcc_pagepool_total_pages_f(u32 v) |
2466 | { | 2474 | { |
2467 | return (v & 0xff) << 0; | 2475 | return (v & 0x3ff) << 0; |
2468 | } | 2476 | } |
2469 | static inline u32 gr_gpcs_tpcs_pe_vaf_r(void) | 2477 | static inline u32 gr_gpcs_tpcs_pe_vaf_r(void) |
2470 | { | 2478 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h index 1ead0679..32c4a01d 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h | |||
@@ -50,6 +50,30 @@ | |||
50 | #ifndef _hw_ltc_gp10b_h_ | 50 | #ifndef _hw_ltc_gp10b_h_ |
51 | #define _hw_ltc_gp10b_h_ | 51 | #define _hw_ltc_gp10b_h_ |
52 | 52 | ||
53 | static inline u32 ltc_ltc0_ltss_tstg_cmgmt0_r(void) | ||
54 | { | ||
55 | return 0xffffffff; | ||
56 | } | ||
57 | static inline u32 ltc_ltc0_ltss_tstg_cmgmt1_r(void) | ||
58 | { | ||
59 | return 0xffffffff; | ||
60 | } | ||
61 | static inline u32 ltc_ltc1_ltss_tstg_cmgmt0_r(void) | ||
62 | { | ||
63 | return 0xffffffff; | ||
64 | } | ||
65 | static inline u32 ltc_ltc1_ltss_tstg_cmgmt1_r(void) | ||
66 | { | ||
67 | return 0xffffffff; | ||
68 | } | ||
69 | static inline u32 ltc_ltcs_ltss_tstg_cmgmt0_r(void) | ||
70 | { | ||
71 | return 0xffffffff; | ||
72 | } | ||
73 | static inline u32 ltc_ltcs_ltss_tstg_cmgmt1_r(void) | ||
74 | { | ||
75 | return 0xffffffff; | ||
76 | } | ||
53 | static inline u32 ltc_ltcs_lts0_cbc_ctrl1_r(void) | 77 | static inline u32 ltc_ltcs_lts0_cbc_ctrl1_r(void) |
54 | { | 78 | { |
55 | return 0x0014046c; | 79 | return 0x0014046c; |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h index f45fdc99..83e06e8e 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h | |||
@@ -50,9 +50,9 @@ | |||
50 | #ifndef _hw_mc_gp10b_h_ | 50 | #ifndef _hw_mc_gp10b_h_ |
51 | #define _hw_mc_gp10b_h_ | 51 | #define _hw_mc_gp10b_h_ |
52 | 52 | ||
53 | static inline u32 mc_intr_0_r(void) | 53 | static inline u32 mc_intr_0_r(u32 i) |
54 | { | 54 | { |
55 | return 0x00000100; | 55 | return 0x00000100 + i*4; |
56 | } | 56 | } |
57 | static inline u32 mc_intr_0_pfifo_pending_f(void) | 57 | static inline u32 mc_intr_0_pfifo_pending_f(void) |
58 | { | 58 | { |
@@ -78,33 +78,9 @@ static inline u32 mc_intr_0_pbus_pending_f(void) | |||
78 | { | 78 | { |
79 | return 0x10000000; | 79 | return 0x10000000; |
80 | } | 80 | } |
81 | static inline u32 mc_intr_mask_0_r(void) | 81 | static inline u32 mc_intr_en_0_r(u32 i) |
82 | { | 82 | { |
83 | return 0x00000640; | 83 | return 0x00000140 + i*4; |
84 | } | ||
85 | static inline u32 mc_intr_mask_0_pmu_enabled_f(void) | ||
86 | { | ||
87 | return 0x1000000; | ||
88 | } | ||
89 | static inline u32 mc_intr_en_0_r(void) | ||
90 | { | ||
91 | return 0x00000140; | ||
92 | } | ||
93 | static inline u32 mc_intr_en_0_inta_disabled_f(void) | ||
94 | { | ||
95 | return 0x0; | ||
96 | } | ||
97 | static inline u32 mc_intr_en_0_inta_hardware_f(void) | ||
98 | { | ||
99 | return 0x1; | ||
100 | } | ||
101 | static inline u32 mc_intr_en_1_r(void) | ||
102 | { | ||
103 | return 0x00000144; | ||
104 | } | ||
105 | static inline u32 mc_intr_en_1_inta_disabled_f(void) | ||
106 | { | ||
107 | return 0x0; | ||
108 | } | 84 | } |
109 | static inline u32 mc_enable_r(void) | 85 | static inline u32 mc_enable_r(void) |
110 | { | 86 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h index d3fa8553..5720cde1 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h | |||
@@ -448,7 +448,7 @@ static inline u32 pbdma_syncpointb_r(u32 i) | |||
448 | } | 448 | } |
449 | static inline u32 pbdma_syncpointb_op_v(u32 r) | 449 | static inline u32 pbdma_syncpointb_op_v(u32 r) |
450 | { | 450 | { |
451 | return (r >> 0) & 0x3; | 451 | return (r >> 0) & 0x1; |
452 | } | 452 | } |
453 | static inline u32 pbdma_syncpointb_op_wait_v(void) | 453 | static inline u32 pbdma_syncpointb_op_wait_v(void) |
454 | { | 454 | { |
@@ -464,6 +464,6 @@ static inline u32 pbdma_syncpointb_wait_switch_en_v(void) | |||
464 | } | 464 | } |
465 | static inline u32 pbdma_syncpointb_syncpt_index_v(u32 r) | 465 | static inline u32 pbdma_syncpointb_syncpt_index_v(u32 r) |
466 | { | 466 | { |
467 | return (r >> 8) & 0xff; | 467 | return (r >> 8) & 0xfff; |
468 | } | 468 | } |
469 | #endif | 469 | #endif |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_trim_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_trim_gp10b.h index 76597f69..94da91b0 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_trim_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_trim_gp10b.h | |||
@@ -200,11 +200,11 @@ static inline u32 trim_sys_gpc2clk_out_sdiv14_indiv4_mode_f(void) | |||
200 | } | 200 | } |
201 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_r(u32 i) | 201 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_r(u32 i) |
202 | { | 202 | { |
203 | return 0x00134124 + i*512; | 203 | return 0x001e0124 + i*1024; |
204 | } | 204 | } |
205 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_noofipclks_f(u32 v) | 205 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_noofipclks_f(u32 v) |
206 | { | 206 | { |
207 | return (v & 0x3fff) << 0; | 207 | return (v & 0xffff) << 0; |
208 | } | 208 | } |
209 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_write_en_asserted_f(void) | 209 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_write_en_asserted_f(void) |
210 | { | 210 | { |
@@ -220,11 +220,11 @@ static inline u32 trim_gpc_clk_cntr_ncgpcclk_cfg_reset_asserted_f(void) | |||
220 | } | 220 | } |
221 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cnt_r(u32 i) | 221 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cnt_r(u32 i) |
222 | { | 222 | { |
223 | return 0x00134128 + i*512; | 223 | return 0x001e0128 + i*1024; |
224 | } | 224 | } |
225 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cnt_value_v(u32 r) | 225 | static inline u32 trim_gpc_clk_cntr_ncgpcclk_cnt_value_v(u32 r) |
226 | { | 226 | { |
227 | return (r >> 0) & 0xfffff; | 227 | return (r >> 0) & 0xfffffff; |
228 | } | 228 | } |
229 | static inline u32 trim_sys_gpcpll_cfg2_r(void) | 229 | static inline u32 trim_sys_gpcpll_cfg2_r(void) |
230 | { | 230 | { |