diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fb_gm20b.c | 402 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fb_gm20b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 3 |
3 files changed, 0 insertions, 407 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c index d23c4787..1f8cc326 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |||
@@ -23,7 +23,6 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/kind_gk20a.h" | ||
27 | #include "gk20a/fb_gk20a.h" | 26 | #include "gk20a/fb_gk20a.h" |
28 | #include "gm20b/fb_gm20b.h" | 27 | #include "gm20b/fb_gm20b.h" |
29 | 28 | ||
@@ -43,407 +42,6 @@ void fb_gm20b_init_fs_state(struct gk20a *g) | |||
43 | g->ltc_count); | 42 | g->ltc_count); |
44 | } | 43 | } |
45 | 44 | ||
46 | noinline_for_stack void gm20b_init_uncompressed_kind_map(void) | ||
47 | { | ||
48 | int i; | ||
49 | |||
50 | for (i = 0; i < 256; i++) | ||
51 | gk20a_uc_kind_map[i] = gmmu_pte_kind_invalid_v(); | ||
52 | |||
53 | /* From gm20b */ | ||
54 | gk20a_uc_kind_map[gmmu_pte_kind_s8_v()] = | ||
55 | gk20a_uc_kind_map[gmmu_pte_kind_s8_2s_v()] = | ||
56 | gmmu_pte_kind_s8_v(); | ||
57 | |||
58 | /* From gk20a */ | ||
59 | gk20a_uc_kind_map[gmmu_pte_kind_z16_v()] = | ||
60 | gk20a_uc_kind_map[gmmu_pte_kind_z16_2c_v()] = | ||
61 | gk20a_uc_kind_map[gmmu_pte_kind_z16_ms2_2c_v()] = | ||
62 | gk20a_uc_kind_map[gmmu_pte_kind_z16_ms4_2c_v()] = | ||
63 | gk20a_uc_kind_map[gmmu_pte_kind_z16_ms8_2c_v()] = | ||
64 | gk20a_uc_kind_map[gmmu_pte_kind_z16_2z_v()] = | ||
65 | gk20a_uc_kind_map[gmmu_pte_kind_z16_ms2_2z_v()] = | ||
66 | gk20a_uc_kind_map[gmmu_pte_kind_z16_ms4_2z_v()] = | ||
67 | gk20a_uc_kind_map[gmmu_pte_kind_z16_ms8_2z_v()] = | ||
68 | gmmu_pte_kind_z16_v(); | ||
69 | |||
70 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_v()] = | ||
71 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_2cz_v()] = | ||
72 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms2_2cz_v()] = | ||
73 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms4_2cz_v()] = | ||
74 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms8_2cz_v()] = | ||
75 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_2cs_v()] = | ||
76 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms2_2cs_v()] = | ||
77 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms4_2cs_v()] = | ||
78 | gk20a_uc_kind_map[gmmu_pte_kind_s8z24_ms8_2cs_v()] = | ||
79 | gmmu_pte_kind_s8z24_v(); | ||
80 | |||
81 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_v()] = | ||
82 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_2cs_v()] = | ||
83 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_2czv_v()] = | ||
84 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc4_2zv_v()] = | ||
85 | gmmu_pte_kind_v8z24_ms4_vc4_v(); | ||
86 | |||
87 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_v()] = | ||
88 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_2cs_v()] = | ||
89 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_2czv_v()] = | ||
90 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc8_2zv_v()] = | ||
91 | gmmu_pte_kind_v8z24_ms8_vc8_v(); | ||
92 | |||
93 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_v()] = | ||
94 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_2cs_v()] = | ||
95 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_2czv_v()] = | ||
96 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms4_vc12_2zv_v()] = | ||
97 | gmmu_pte_kind_v8z24_ms4_vc12_v(); | ||
98 | |||
99 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_v()] = | ||
100 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()] = | ||
101 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_2czv_v()] = | ||
102 | gk20a_uc_kind_map[gmmu_pte_kind_v8z24_ms8_vc24_2zv_v()] = | ||
103 | gmmu_pte_kind_v8z24_ms8_vc24_v(); | ||
104 | |||
105 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_v()] = | ||
106 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_2cs_v()] = | ||
107 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms2_2cs_v()] = | ||
108 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms4_2cs_v()] = | ||
109 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms8_2cs_v()] = | ||
110 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_2cz_v()] = | ||
111 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms2_2cz_v()] = | ||
112 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms4_2cz_v()] = | ||
113 | gk20a_uc_kind_map[gmmu_pte_kind_z24s8_ms8_2cz_v()] = | ||
114 | gmmu_pte_kind_z24s8_v(); | ||
115 | |||
116 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_v()] = | ||
117 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_2cs_v()] = | ||
118 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms2_2cs_v()] = | ||
119 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms4_2cs_v()] = | ||
120 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms8_2cs_v()] = | ||
121 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_2cz_v()] = | ||
122 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms2_2cz_v()] = | ||
123 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms4_2cz_v()] = | ||
124 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_ms8_2cz_v()] = | ||
125 | gmmu_pte_kind_zf32_v(); | ||
126 | |||
127 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_v()] = | ||
128 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_2cs_v()] = | ||
129 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_2cszv_v()] = | ||
130 | gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_v(); | ||
131 | |||
132 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_v()] = | ||
133 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_2cs_v()] = | ||
134 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_2cszv_v()] = | ||
135 | gmmu_pte_kind_x8z24_x16v8s8_ms4_vc4_v(); | ||
136 | |||
137 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_v()] = | ||
138 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_2cs_v()] = | ||
139 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_2cszv_v()] = | ||
140 | gmmu_pte_kind_x8z24_x16v8s8_ms8_vc8_v(); | ||
141 | |||
142 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_v()] = | ||
143 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cs_v()] = | ||
144 | gk20a_uc_kind_map[gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cszv_v()] = | ||
145 | gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_v(); | ||
146 | |||
147 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_v()] = | ||
148 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_2cs_v()] = | ||
149 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_2cszv_v()] = | ||
150 | gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_v(); | ||
151 | |||
152 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_v()] = | ||
153 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_2cs_v()] = | ||
154 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_2cszv_v()] = | ||
155 | gmmu_pte_kind_zf32_x16v8s8_ms4_vc4_v(); | ||
156 | |||
157 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_v()] = | ||
158 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_2cs_v()] = | ||
159 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_2cszv_v()] = | ||
160 | gmmu_pte_kind_zf32_x16v8s8_ms8_vc8_v(); | ||
161 | |||
162 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_v()] = | ||
163 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cs_v()] = | ||
164 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cszv_v()] = | ||
165 | gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_v(); | ||
166 | |||
167 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_v()] = | ||
168 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_2cszv_v()] = | ||
169 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms2_2cszv_v()] = | ||
170 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms4_2cszv_v()] = | ||
171 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms8_2cszv_v()] = | ||
172 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_2cs_v()] = | ||
173 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms2_2cs_v()] = | ||
174 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms4_2cs_v()] = | ||
175 | gk20a_uc_kind_map[gmmu_pte_kind_zf32_x24s8_ms8_2cs_v()] = | ||
176 | gmmu_pte_kind_zf32_x24s8_v(); | ||
177 | |||
178 | gk20a_uc_kind_map[gmmu_pte_kind_c32_2c_v()] = | ||
179 | gk20a_uc_kind_map[gmmu_pte_kind_c32_2cba_v()] = | ||
180 | gk20a_uc_kind_map[gmmu_pte_kind_c32_2cra_v()] = | ||
181 | gk20a_uc_kind_map[gmmu_pte_kind_c32_2bra_v()] = | ||
182 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms2_2c_v()] = | ||
183 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms2_2cra_v()] = | ||
184 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2c_v()] = | ||
185 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2cbr_v()] = | ||
186 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2cba_v()] = | ||
187 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2cra_v()] = | ||
188 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms4_2bra_v()] = | ||
189 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms8_ms16_2c_v()] = | ||
190 | gk20a_uc_kind_map[gmmu_pte_kind_c32_ms8_ms16_2cra_v()] = | ||
191 | gk20a_uc_kind_map[gmmu_pte_kind_c64_2c_v()] = | ||
192 | gk20a_uc_kind_map[gmmu_pte_kind_c64_2cbr_v()] = | ||
193 | gk20a_uc_kind_map[gmmu_pte_kind_c64_2cba_v()] = | ||
194 | gk20a_uc_kind_map[gmmu_pte_kind_c64_2cra_v()] = | ||
195 | gk20a_uc_kind_map[gmmu_pte_kind_c64_2bra_v()] = | ||
196 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms2_2c_v()] = | ||
197 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms2_2cra_v()] = | ||
198 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2c_v()] = | ||
199 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2cbr_v()] = | ||
200 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2cba_v()] = | ||
201 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2cra_v()] = | ||
202 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms4_2bra_v()] = | ||
203 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms8_ms16_2c_v()] = | ||
204 | gk20a_uc_kind_map[gmmu_pte_kind_c64_ms8_ms16_2cra_v()] = | ||
205 | gk20a_uc_kind_map[gmmu_pte_kind_c128_2c_v()] = | ||
206 | gk20a_uc_kind_map[gmmu_pte_kind_c128_2cr_v()] = | ||
207 | gk20a_uc_kind_map[gmmu_pte_kind_c128_ms2_2c_v()] = | ||
208 | gk20a_uc_kind_map[gmmu_pte_kind_c128_ms2_2cr_v()] = | ||
209 | gk20a_uc_kind_map[gmmu_pte_kind_c128_ms4_2c_v()] = | ||
210 | gk20a_uc_kind_map[gmmu_pte_kind_c128_ms4_2cr_v()] = | ||
211 | gk20a_uc_kind_map[gmmu_pte_kind_c128_ms8_ms16_2c_v()] = | ||
212 | gk20a_uc_kind_map[gmmu_pte_kind_c128_ms8_ms16_2cr_v()] = | ||
213 | gmmu_pte_kind_generic_16bx2_v(); | ||
214 | |||
215 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc4_2czv_v()] = | ||
216 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc4_2cs_v()] = | ||
217 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc4_2zv_v()] = | ||
218 | gmmu_pte_kind_z24v8_ms4_vc4_v(); | ||
219 | |||
220 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc12_2czv_v()] = | ||
221 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc12_2cs_v()] = | ||
222 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms4_vc12_2zv_v()] = | ||
223 | gmmu_pte_kind_z24v8_ms4_vc12_v(); | ||
224 | |||
225 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc8_2cs_v()] = | ||
226 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc8_2czv_v()] = | ||
227 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc8_2zv_v()] = | ||
228 | gmmu_pte_kind_z24v8_ms8_vc8_v(); | ||
229 | |||
230 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()] = | ||
231 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc24_2czv_v()] = | ||
232 | gk20a_uc_kind_map[gmmu_pte_kind_z24v8_ms8_vc24_2zv_v()] = | ||
233 | gmmu_pte_kind_z24v8_ms8_vc24_v(); | ||
234 | |||
235 | gk20a_uc_kind_map[gmmu_pte_kind_x8c24_v()] = | ||
236 | gmmu_pte_kind_x8c24_v(); | ||
237 | } | ||
238 | |||
239 | static noinline_for_stack bool gm20b_kind_supported(u8 k) | ||
240 | { | ||
241 | return /* From gm20b */ | ||
242 | (k == gmmu_pte_kind_smsked_message_v()) | ||
243 | || (k >= gmmu_pte_kind_s8_v() && | ||
244 | k <= gmmu_pte_kind_s8_2s_v()) | ||
245 | /* From gk20a */ | ||
246 | || gk20a_kind_work_creation(k) | ||
247 | || (k == gmmu_pte_kind_invalid_v()) | ||
248 | || (k == gmmu_pte_kind_pitch_v()) | ||
249 | || (k >= gmmu_pte_kind_z16_v() && | ||
250 | k <= gmmu_pte_kind_z16_ms8_2c_v()) | ||
251 | || (k >= gmmu_pte_kind_z16_2z_v() && | ||
252 | k <= gmmu_pte_kind_z16_ms8_2z_v()) | ||
253 | || (k == gmmu_pte_kind_s8z24_v()) | ||
254 | || (k >= gmmu_pte_kind_s8z24_2cz_v() && | ||
255 | k <= gmmu_pte_kind_s8z24_ms8_2cz_v()) | ||
256 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_v() && | ||
257 | k <= gmmu_pte_kind_v8z24_ms8_vc24_v()) | ||
258 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && | ||
259 | k <= gmmu_pte_kind_v8z24_ms8_vc24_2zv_v()) | ||
260 | || (k == gmmu_pte_kind_z24s8_v()) | ||
261 | || (k >= gmmu_pte_kind_z24s8_2cz_v() && | ||
262 | k <= gmmu_pte_kind_z24s8_ms8_2cz_v()) | ||
263 | || (k == gmmu_pte_kind_zf32_v()) | ||
264 | || (k >= gmmu_pte_kind_zf32_2cz_v() && | ||
265 | k <= gmmu_pte_kind_zf32_ms8_2cz_v()) | ||
266 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_v() && | ||
267 | k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_v()) | ||
268 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_2cszv_v() && | ||
269 | k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_v()) | ||
270 | || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_2cszv_v() && | ||
271 | k <= gmmu_pte_kind_zf32_x24s8_v()) | ||
272 | || (k >= gmmu_pte_kind_zf32_x24s8_2cszv_v() && | ||
273 | k <= gmmu_pte_kind_zf32_x24s8_ms8_2cszv_v()) | ||
274 | || (k == gmmu_pte_kind_generic_16bx2_v()) | ||
275 | || (k == gmmu_pte_kind_c32_2c_v()) | ||
276 | || (k == gmmu_pte_kind_c32_2cra_v()) | ||
277 | || (k == gmmu_pte_kind_c32_ms2_2c_v()) | ||
278 | || (k == gmmu_pte_kind_c32_ms2_2cra_v()) | ||
279 | || (k >= gmmu_pte_kind_c32_ms4_2c_v() && | ||
280 | k <= gmmu_pte_kind_c32_ms4_2cbr_v()) | ||
281 | || (k >= gmmu_pte_kind_c32_ms4_2cra_v() && | ||
282 | k <= gmmu_pte_kind_c64_2c_v()) | ||
283 | || (k == gmmu_pte_kind_c64_2cra_v()) | ||
284 | || (k == gmmu_pte_kind_c64_ms2_2c_v()) | ||
285 | || (k == gmmu_pte_kind_c64_ms2_2cra_v()) | ||
286 | || (k >= gmmu_pte_kind_c64_ms4_2c_v() && | ||
287 | k <= gmmu_pte_kind_c64_ms4_2cbr_v()) | ||
288 | || (k >= gmmu_pte_kind_c64_ms4_2cra_v() && | ||
289 | k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()) | ||
290 | || (k == gmmu_pte_kind_pitch_no_swizzle_v()); | ||
291 | } | ||
292 | |||
293 | static noinline_for_stack bool gm20b_kind_z(u8 k) | ||
294 | { | ||
295 | return /* From gm20b */ | ||
296 | (k >= gmmu_pte_kind_s8_v() && | ||
297 | k <= gmmu_pte_kind_s8_2s_v()) | ||
298 | /* From gk20a */ | ||
299 | || (k >= gmmu_pte_kind_z16_v() && | ||
300 | k <= gmmu_pte_kind_v8z24_ms8_vc24_v()) | ||
301 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_1zv_v() && | ||
302 | k <= gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()) | ||
303 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && | ||
304 | k <= gmmu_pte_kind_z24v8_ms8_vc24_v()) | ||
305 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_1zv_v() && | ||
306 | k <= gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()) | ||
307 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2czv_v() && | ||
308 | k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_1cs_v()) | ||
309 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1zv_v() && | ||
310 | k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_1cs_v()) | ||
311 | || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1zv_v() && | ||
312 | k <= gmmu_pte_kind_zf32_x24s8_ms16_1cs_v()); | ||
313 | } | ||
314 | |||
315 | static noinline_for_stack bool gm20b_kind_c(u8 k) | ||
316 | { | ||
317 | return gk20a_kind_work_creation(k) | ||
318 | || (k == gmmu_pte_kind_pitch_v()) | ||
319 | || (k == gmmu_pte_kind_generic_16bx2_v()) | ||
320 | || (k >= gmmu_pte_kind_c32_2c_v() && | ||
321 | k <= gmmu_pte_kind_c32_ms2_2cbr_v()) | ||
322 | || (k == gmmu_pte_kind_c32_ms2_2cra_v()) | ||
323 | || (k >= gmmu_pte_kind_c32_ms4_2c_v() && | ||
324 | k <= gmmu_pte_kind_c64_ms2_2cbr_v()) | ||
325 | || (k == gmmu_pte_kind_c64_ms2_2cra_v()) | ||
326 | || (k >= gmmu_pte_kind_c64_ms4_2c_v() && | ||
327 | k <= gmmu_pte_kind_pitch_no_swizzle_v()); | ||
328 | } | ||
329 | |||
330 | static noinline_for_stack bool gm20b_kind_compressible(u8 k) | ||
331 | { | ||
332 | return /* From gm20b */ | ||
333 | (k >= gmmu_pte_kind_s8_v() && | ||
334 | k <= gmmu_pte_kind_s8_2s_v()) | ||
335 | /* From gk20a */ | ||
336 | || (k >= gmmu_pte_kind_z16_2c_v() && | ||
337 | k <= gmmu_pte_kind_z16_ms16_4cz_v()) | ||
338 | || (k >= gmmu_pte_kind_s8z24_1z_v() && | ||
339 | k <= gmmu_pte_kind_s8z24_ms16_4cszv_v()) | ||
340 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_1zv_v() && | ||
341 | k <= gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()) | ||
342 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && | ||
343 | k <= gmmu_pte_kind_v8z24_ms8_vc24_4cszv_v()) | ||
344 | || (k >= gmmu_pte_kind_z24s8_1z_v() && | ||
345 | k <= gmmu_pte_kind_z24s8_ms16_4cszv_v()) | ||
346 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_1zv_v() && | ||
347 | k <= gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()) | ||
348 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2czv_v() && | ||
349 | k <= gmmu_pte_kind_z24v8_ms8_vc24_4cszv_v()) | ||
350 | || (k >= gmmu_pte_kind_zf32_1z_v() && | ||
351 | k <= gmmu_pte_kind_zf32_ms16_2cz_v()) | ||
352 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1cs_v() && | ||
353 | k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_1cs_v()) | ||
354 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1zv_v() && | ||
355 | k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cszv_v()) | ||
356 | || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1cs_v() && | ||
357 | k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_1cs_v()) | ||
358 | || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1zv_v() && | ||
359 | k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cszv_v()) | ||
360 | || (k >= gmmu_pte_kind_zf32_x24s8_1cs_v() && | ||
361 | k <= gmmu_pte_kind_zf32_x24s8_ms16_1cs_v()) | ||
362 | || (k >= gmmu_pte_kind_zf32_x24s8_2cszv_v() && | ||
363 | k <= gmmu_pte_kind_c32_ms2_2cbr_v()) | ||
364 | || (k == gmmu_pte_kind_c32_ms2_2cra_v()) | ||
365 | || (k >= gmmu_pte_kind_c32_ms4_2c_v() && | ||
366 | k <= gmmu_pte_kind_c64_ms2_2cbr_v()) | ||
367 | || (k == gmmu_pte_kind_c64_ms2_2cra_v()) | ||
368 | || (k >= gmmu_pte_kind_c64_ms4_2c_v() && | ||
369 | k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()); | ||
370 | } | ||
371 | |||
372 | static noinline_for_stack bool gm20b_kind_zbc(u8 k) | ||
373 | { | ||
374 | return /* From gm20b */ | ||
375 | (k >= gmmu_pte_kind_s8_v() && | ||
376 | k <= gmmu_pte_kind_s8_2s_v()) | ||
377 | /* From gk20a */ | ||
378 | || (k >= gmmu_pte_kind_z16_2c_v() && | ||
379 | k <= gmmu_pte_kind_z16_ms16_2c_v()) | ||
380 | || (k >= gmmu_pte_kind_z16_4cz_v() && | ||
381 | k <= gmmu_pte_kind_z16_ms16_4cz_v()) | ||
382 | || (k >= gmmu_pte_kind_s8z24_2cz_v() && | ||
383 | k <= gmmu_pte_kind_s8z24_ms16_4cszv_v()) | ||
384 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2cs_v() && | ||
385 | k <= gmmu_pte_kind_v8z24_ms8_vc24_2cs_v()) | ||
386 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_2czv_v() && | ||
387 | k <= gmmu_pte_kind_v8z24_ms8_vc24_2czv_v()) | ||
388 | || (k >= gmmu_pte_kind_v8z24_ms4_vc12_4cszv_v() && | ||
389 | k <= gmmu_pte_kind_v8z24_ms8_vc24_4cszv_v()) | ||
390 | || (k >= gmmu_pte_kind_z24s8_2cs_v() && | ||
391 | k <= gmmu_pte_kind_z24s8_ms16_4cszv_v()) | ||
392 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2cs_v() && | ||
393 | k <= gmmu_pte_kind_z24v8_ms8_vc24_2cs_v()) | ||
394 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_2czv_v() && | ||
395 | k <= gmmu_pte_kind_z24v8_ms8_vc24_2czv_v()) | ||
396 | || (k >= gmmu_pte_kind_z24v8_ms4_vc12_4cszv_v() && | ||
397 | k <= gmmu_pte_kind_z24v8_ms8_vc24_4cszv_v()) | ||
398 | || (k >= gmmu_pte_kind_zf32_2cs_v() && | ||
399 | k <= gmmu_pte_kind_zf32_ms16_2cz_v()) | ||
400 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1cs_v() && | ||
401 | k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_1cs_v()) | ||
402 | || (k >= gmmu_pte_kind_x8z24_x16v8s8_ms4_vc12_1czv_v() && | ||
403 | k <= gmmu_pte_kind_x8z24_x16v8s8_ms8_vc24_2cszv_v()) | ||
404 | || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1cs_v() && | ||
405 | k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_1cs_v()) | ||
406 | || (k >= gmmu_pte_kind_zf32_x16v8s8_ms4_vc12_1czv_v() && | ||
407 | k <= gmmu_pte_kind_zf32_x16v8s8_ms8_vc24_2cszv_v()) | ||
408 | || (k >= gmmu_pte_kind_zf32_x24s8_1cs_v() && | ||
409 | k <= gmmu_pte_kind_zf32_x24s8_ms16_1cs_v()) | ||
410 | || (k >= gmmu_pte_kind_zf32_x24s8_2cszv_v() && | ||
411 | k <= gmmu_pte_kind_c32_2cra_v()) | ||
412 | || (k >= gmmu_pte_kind_c32_ms2_2c_v() && | ||
413 | k <= gmmu_pte_kind_c32_ms2_2cbr_v()) | ||
414 | || (k == gmmu_pte_kind_c32_ms2_2cra_v()) | ||
415 | || (k >= gmmu_pte_kind_c32_ms4_2c_v() && | ||
416 | k <= gmmu_pte_kind_c32_ms4_2cra_v()) | ||
417 | || (k >= gmmu_pte_kind_c32_ms8_ms16_2c_v() && | ||
418 | k <= gmmu_pte_kind_c64_2cra_v()) | ||
419 | || (k >= gmmu_pte_kind_c64_ms2_2c_v() && | ||
420 | k <= gmmu_pte_kind_c64_ms2_2cbr_v()) | ||
421 | || (k == gmmu_pte_kind_c64_ms2_2cra_v()) | ||
422 | || (k >= gmmu_pte_kind_c64_ms4_2c_v() && | ||
423 | k <= gmmu_pte_kind_c64_ms4_2cra_v()) | ||
424 | || (k >= gmmu_pte_kind_c64_ms8_ms16_2c_v() && | ||
425 | k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()); | ||
426 | } | ||
427 | |||
428 | void gm20b_init_kind_attr(void) | ||
429 | { | ||
430 | u16 k; | ||
431 | |||
432 | for (k = 0; k < NV_KIND_ATTR_SIZE; k++) { | ||
433 | gk20a_kind_attr[k] = 0; | ||
434 | if (gm20b_kind_supported((u8)k)) | ||
435 | gk20a_kind_attr[k] |= GK20A_KIND_ATTR_SUPPORTED; | ||
436 | if (gm20b_kind_compressible((u8)k)) | ||
437 | gk20a_kind_attr[k] |= GK20A_KIND_ATTR_COMPRESSIBLE; | ||
438 | if (gm20b_kind_z((u8)k)) | ||
439 | gk20a_kind_attr[k] |= GK20A_KIND_ATTR_Z; | ||
440 | if (gm20b_kind_c((u8)k)) | ||
441 | gk20a_kind_attr[k] |= GK20A_KIND_ATTR_C; | ||
442 | if (gm20b_kind_zbc((u8)k)) | ||
443 | gk20a_kind_attr[k] |= GK20A_KIND_ATTR_ZBC; | ||
444 | } | ||
445 | } | ||
446 | |||
447 | void gm20b_fb_set_mmu_page_size(struct gk20a *g) | 45 | void gm20b_fb_set_mmu_page_size(struct gk20a *g) |
448 | { | 46 | { |
449 | /* set large page size in fb */ | 47 | /* set large page size in fb */ |
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h b/drivers/gpu/nvgpu/gm20b/fb_gm20b.h index 1bc0c14c..32d36f57 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.h | |||
@@ -37,6 +37,4 @@ int gm20b_fb_vpr_info_fetch(struct gk20a *g); | |||
37 | bool gm20b_fb_debug_mode_enabled(struct gk20a *g); | 37 | bool gm20b_fb_debug_mode_enabled(struct gk20a *g); |
38 | void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable); | 38 | void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable); |
39 | 39 | ||
40 | void gm20b_init_uncompressed_kind_map(void); | ||
41 | void gm20b_init_kind_attr(void); | ||
42 | #endif | 40 | #endif |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 20ab808a..42df76c9 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -703,9 +703,6 @@ int gm20b_init_hal(struct gk20a *g) | |||
703 | g->pmu_lsf_pmu_wpr_init_done = 0; | 703 | g->pmu_lsf_pmu_wpr_init_done = 0; |
704 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; | 704 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; |
705 | 705 | ||
706 | gm20b_init_uncompressed_kind_map(); | ||
707 | gm20b_init_kind_attr(); | ||
708 | |||
709 | g->name = "gm20b"; | 706 | g->name = "gm20b"; |
710 | 707 | ||
711 | return 0; | 708 | return 0; |