From 43758d93b7d6acec52906764fc46ae8aa57f9ee1 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 31 Jul 2014 14:33:32 +0300 Subject: gpu: nvgpu: FE object table has 4 elements Restrict reading of FE object table to the number of entries available. Change-Id: I11275ecd14e53f0b763d00d65042adb4b1e8ae6f Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/449306 --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index db655c32..0c71ece3 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -5550,8 +5550,8 @@ int gk20a_gr_isr(struct gk20a *g) isr_data.curr_ctx = gk20a_readl(g, gr_fecs_current_ctx_r()); isr_data.offset = gr_trapped_addr_mthd_v(isr_data.addr); isr_data.sub_chan = gr_trapped_addr_subch_v(isr_data.addr); - obj_table = gk20a_readl(g, - gr_fe_object_table_r(isr_data.sub_chan)); + obj_table = (isr_data.sub_chan < 4) ? gk20a_readl(g, + gr_fe_object_table_r(isr_data.sub_chan)) : 0; isr_data.class_num = gr_fe_object_table_nvclass_v(obj_table); isr_data.chid = -- cgit v1.2.2