summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Daifuku <pdaifuku@nvidia.com>2016-06-23 16:29:31 -0400
committerVladislav Buzov <vbuzov@nvidia.com>2016-07-22 12:20:22 -0400
commitb2a86525278423b60797bb25b3bd89aeefba77d4 (patch)
tree3cac4910b4c1ac3456d25d25c554c88011a01bf9
parent6706e4c40646cbde8a8106a13de285eda6ede701 (diff)
gpu: nvgpu: fix pri_is_be_addr
Correct the formula used to determine the range for BE registers Bug 1778245 Change-Id: I5443b3e68d920cecd031a9b154ed90f26e5251b2 Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com> Reviewed-on: http://git-master/r/1170602 (cherry picked from commit 813a08f1aa758d718987b4e6f2cf2ac8d15a1611) Reviewed-on: http://git-master/r/1177828 (cherry picked from commit de8239a5c6241419b98276a5f549ed8cfd7f4cf9) Reviewed-on: http://git-master/r/1181500 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Richard Zhao <rizhao@nvidia.com> Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> GVS: Gerrit_Virtual_Submit
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
index 62e276de..a7656d38 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
@@ -124,11 +124,10 @@ static inline u32 pri_be_shared_addr(struct gk20a *g, u32 addr)
124} 124}
125static inline bool pri_is_be_addr(struct gk20a *g, u32 addr) 125static inline bool pri_is_be_addr(struct gk20a *g, u32 addr)
126{ 126{
127 u32 num_fbps = nvgpu_get_litter_value(g, GPU_LIT_NUM_FBPS);
128 u32 rop_base = nvgpu_get_litter_value(g, GPU_LIT_ROP_BASE); 127 u32 rop_base = nvgpu_get_litter_value(g, GPU_LIT_ROP_BASE);
129 u32 rop_stride = nvgpu_get_litter_value(g, GPU_LIT_ROP_STRIDE); 128 u32 rop_stride = nvgpu_get_litter_value(g, GPU_LIT_ROP_STRIDE);
130 return ((addr >= rop_base) && 129 return ((addr >= rop_base) &&
131 (addr < rop_base + num_fbps * rop_stride)) || 130 (addr < rop_base + g->ltc_count * rop_stride)) ||
132 pri_is_be_addr_shared(g, addr); 131 pri_is_be_addr_shared(g, addr);
133} 132}
134 133