From dd5b630e13d8ca97b38e81670ff45ef2ec0b810c Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Wed, 16 Nov 2016 15:32:52 -0800 Subject: gpu: nvgpu: fix gpc addr determination Fix pri_is_gpc_addr: determines whether a register offset is a GPC address. Needed for: Bug 200249125 Change-Id: I8322efc95cb8d02fa42b916f6649d9fa3f93171c Signed-off-by: Peter Daifuku Reviewed-on: http://git-master/r/1255061 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h index 88521555..411430c7 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h @@ -53,7 +53,7 @@ static inline bool pri_is_gpc_addr(struct gk20a *g, u32 addr) u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE); u32 num_gpcs = nvgpu_get_litter_value(g, GPU_LIT_NUM_GPCS); return ((addr >= gpc_base) && - (addr < gpc_base) + num_gpcs * gpc_stride) || + (addr < gpc_base + num_gpcs * gpc_stride)) || pri_is_gpc_addr_shared(g, addr); } static inline u32 pri_get_gpc_num(struct gk20a *g, u32 addr) -- cgit v1.2.2