diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index a8cbca13..9812c8d8 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -276,7 +276,7 @@ void gm20b_flush_ltc(struct gk20a *g) | |||
276 | u32 ltc_stride = nvgpu_get_litter_value(g, GPU_LIT_LTC_STRIDE); | 276 | u32 ltc_stride = nvgpu_get_litter_value(g, GPU_LIT_LTC_STRIDE); |
277 | 277 | ||
278 | /* Clean... */ | 278 | /* Clean... */ |
279 | gk20a_writel(g, ltc_ltcs_ltss_tstg_cmgmt1_r(), | 279 | nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_cmgmt1_r(), |
280 | ltc_ltcs_ltss_tstg_cmgmt1_clean_pending_f() | | 280 | ltc_ltcs_ltss_tstg_cmgmt1_clean_pending_f() | |
281 | ltc_ltcs_ltss_tstg_cmgmt1_max_cycles_between_cleans_3_f() | | 281 | ltc_ltcs_ltss_tstg_cmgmt1_max_cycles_between_cleans_3_f() | |
282 | ltc_ltcs_ltss_tstg_cmgmt1_clean_wait_for_fb_to_pull_true_f() | | 282 | ltc_ltcs_ltss_tstg_cmgmt1_clean_wait_for_fb_to_pull_true_f() | |
@@ -318,7 +318,7 @@ void gm20b_flush_ltc(struct gk20a *g) | |||
318 | } | 318 | } |
319 | 319 | ||
320 | /* And invalidate. */ | 320 | /* And invalidate. */ |
321 | gk20a_writel(g, ltc_ltcs_ltss_tstg_cmgmt0_r(), | 321 | nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_cmgmt0_r(), |
322 | ltc_ltcs_ltss_tstg_cmgmt0_invalidate_pending_f() | | 322 | ltc_ltcs_ltss_tstg_cmgmt0_invalidate_pending_f() | |
323 | ltc_ltcs_ltss_tstg_cmgmt0_max_cycles_between_invalidates_3_f() | | 323 | ltc_ltcs_ltss_tstg_cmgmt0_max_cycles_between_invalidates_3_f() | |
324 | ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_last_class_true_f() | | 324 | ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_last_class_true_f() | |
@@ -393,15 +393,15 @@ void gm20b_ltc_set_zbc_color_entry(struct gk20a *g, | |||
393 | u32 i; | 393 | u32 i; |
394 | u32 real_index = index + GK20A_STARTOF_ZBC_TABLE; | 394 | u32 real_index = index + GK20A_STARTOF_ZBC_TABLE; |
395 | 395 | ||
396 | gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_index_r(), | 396 | nvgpu_writel_check(g, ltc_ltcs_ltss_dstg_zbc_index_r(), |
397 | ltc_ltcs_ltss_dstg_zbc_index_address_f(real_index)); | 397 | ltc_ltcs_ltss_dstg_zbc_index_address_f(real_index)); |
398 | 398 | ||
399 | for (i = 0; | 399 | for (i = 0; |
400 | i < ltc_ltcs_ltss_dstg_zbc_color_clear_value__size_1_v(); i++) { | 400 | i < ltc_ltcs_ltss_dstg_zbc_color_clear_value__size_1_v(); i++) { |
401 | gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_color_clear_value_r(i), | 401 | nvgpu_writel_check(g, |
402 | color_val->color_l2[i]); | 402 | ltc_ltcs_ltss_dstg_zbc_color_clear_value_r(i), |
403 | color_val->color_l2[i]); | ||
403 | } | 404 | } |
404 | gk20a_readl(g, ltc_ltcs_ltss_dstg_zbc_index_r()); | ||
405 | } | 405 | } |
406 | 406 | ||
407 | /* | 407 | /* |
@@ -413,13 +413,12 @@ void gm20b_ltc_set_zbc_depth_entry(struct gk20a *g, | |||
413 | { | 413 | { |
414 | u32 real_index = index + GK20A_STARTOF_ZBC_TABLE; | 414 | u32 real_index = index + GK20A_STARTOF_ZBC_TABLE; |
415 | 415 | ||
416 | gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_index_r(), | 416 | nvgpu_writel_check(g, ltc_ltcs_ltss_dstg_zbc_index_r(), |
417 | ltc_ltcs_ltss_dstg_zbc_index_address_f(real_index)); | 417 | ltc_ltcs_ltss_dstg_zbc_index_address_f(real_index)); |
418 | 418 | ||
419 | gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_depth_clear_value_r(), | 419 | nvgpu_writel_check(g, |
420 | depth_val->depth); | 420 | ltc_ltcs_ltss_dstg_zbc_depth_clear_value_r(), |
421 | 421 | depth_val->depth); | |
422 | gk20a_readl(g, ltc_ltcs_ltss_dstg_zbc_index_r()); | ||
423 | } | 422 | } |
424 | 423 | ||
425 | void gm20b_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr) | 424 | void gm20b_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr) |