summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-01-06 12:45:22 -0500
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-01-15 17:15:55 -0500
commitb9cbb12132b52c268b3f727f50416efd75fead0f (patch)
treee6cc0fb139398fe23872b8609a8515ef672fb7b0 /drivers
parent2113479bbf136f399c83a5d6ad7b77230ff0a904 (diff)
gpu: nvgpu: Do not readback L2 ZBC RAM
Do not read back L2 ZBC RAM. That can conflict with in-flight transactions causing a live-lock. Change-Id: I6122af48513b5a4b801202dc611eba58ce86aa4d Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/929580 GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/ltc_common.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_common.c b/drivers/gpu/nvgpu/gk20a/ltc_common.c
index 1c18418c..cc0932d9 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_common.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_common.c
@@ -53,9 +53,10 @@ static void gk20a_ltc_set_zbc_color_entry(struct gk20a *g,
53 53
54 for (i = 0; 54 for (i = 0;
55 i < ltc_ltcs_ltss_dstg_zbc_color_clear_value__size_1_v(); i++) { 55 i < ltc_ltcs_ltss_dstg_zbc_color_clear_value__size_1_v(); i++) {
56 gk20a_writel_check(g, ltc_ltcs_ltss_dstg_zbc_color_clear_value_r(i), 56 gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_color_clear_value_r(i),
57 color_val->color_l2[i]); 57 color_val->color_l2[i]);
58 } 58 }
59 gk20a_readl(g, ltc_ltcs_ltss_dstg_zbc_index_r());
59} 60}
60 61
61/* 62/*
@@ -70,8 +71,10 @@ static void gk20a_ltc_set_zbc_depth_entry(struct gk20a *g,
70 gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_index_r(), 71 gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_index_r(),
71 ltc_ltcs_ltss_dstg_zbc_index_address_f(real_index)); 72 ltc_ltcs_ltss_dstg_zbc_index_address_f(real_index));
72 73
73 gk20a_writel_check(g, ltc_ltcs_ltss_dstg_zbc_depth_clear_value_r(), 74 gk20a_writel(g, ltc_ltcs_ltss_dstg_zbc_depth_clear_value_r(),
74 depth_val->depth); 75 depth_val->depth);
76
77 gk20a_readl(g, ltc_ltcs_ltss_dstg_zbc_index_r());
75} 78}
76 79
77static int gk20a_ltc_alloc_phys_cbc(struct gk20a *g, 80static int gk20a_ltc_alloc_phys_cbc(struct gk20a *g,