summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
diff options
context:
space:
mode:
authorVinod G <vinodg@nvidia.com>2018-06-26 21:09:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-07-14 18:36:53 -0400
commitac98827c9d81746020dce689f9eb8c4018a8c148 (patch)
tree142dea7d1109be3b12a4e94c738a01ab7b13ee89 /drivers/gpu/nvgpu/gp10b/gr_gp10b.c
parentb97bcb3c689426a1b099e88ceef4d55584e2362b (diff)
gpu: nvgpu: Add L2 register read-backs following writes
LTC register write is followed by a register read and if data doesn't match code will report the error. Renamed existing nvgpu_writel_check function as nvgpu_writel_loop as it loops until the write get success. nvgpu_writel_check function write and read back and compare the data. Bug 2039150 Change-Id: I0a49be36aad23936f2d58aa82872710827da1d32 Signed-off-by: Vinod G <vinodg@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1762344 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/gr_gp10b.c')
-rw-r--r--drivers/gpu/nvgpu/gp10b/gr_gp10b.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 6249992a..424c8490 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -537,18 +537,18 @@ int gr_gp10b_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr,
537 gr->zbc_col_tbl[index].format = color_val->format; 537 gr->zbc_col_tbl[index].format = color_val->format;
538 gr->zbc_col_tbl[index].ref_cnt++; 538 gr->zbc_col_tbl[index].ref_cnt++;
539 539
540 gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_r_r(index), 540 nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_r_r(index),
541 color_val->color_ds[0]); 541 color_val->color_ds[0]);
542 gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_g_r(index), 542 nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_g_r(index),
543 color_val->color_ds[1]); 543 color_val->color_ds[1]);
544 gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_b_r(index), 544 nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_b_r(index),
545 color_val->color_ds[2]); 545 color_val->color_ds[2]);
546 gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_a_r(index), 546 nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_a_r(index),
547 color_val->color_ds[3]); 547 color_val->color_ds[3]);
548 zbc_c = gk20a_readl(g, zbc_c_format_reg + (index & ~3)); 548 zbc_c = gk20a_readl(g, zbc_c_format_reg + (index & ~3));
549 zbc_c &= ~(0x7f << ((index % 4) * 7)); 549 zbc_c &= ~(0x7f << ((index % 4) * 7));
550 zbc_c |= color_val->format << ((index % 4) * 7); 550 zbc_c |= color_val->format << ((index % 4) * 7);
551 gk20a_writel_check(g, zbc_c_format_reg + (index & ~3), zbc_c); 551 nvgpu_writel_loop(g, zbc_c_format_reg + (index & ~3), zbc_c);
552 552
553 return 0; 553 return 0;
554} 554}