diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-07-31 07:33:32 -0400 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:20 -0400 |
| commit | 43758d93b7d6acec52906764fc46ae8aa57f9ee1 (patch) | |
| tree | 34c6d020eda86912ba5b20baa2424aa2b54e25e0 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |
| parent | 4a63e80a2603fca0569095e481bca61091090791 (diff) | |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/449306
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 5550 | isr_data.curr_ctx = gk20a_readl(g, gr_fecs_current_ctx_r()); | 5550 | isr_data.curr_ctx = gk20a_readl(g, gr_fecs_current_ctx_r()); |
| 5551 | isr_data.offset = gr_trapped_addr_mthd_v(isr_data.addr); | 5551 | isr_data.offset = gr_trapped_addr_mthd_v(isr_data.addr); |
| 5552 | isr_data.sub_chan = gr_trapped_addr_subch_v(isr_data.addr); | 5552 | isr_data.sub_chan = gr_trapped_addr_subch_v(isr_data.addr); |
| 5553 | obj_table = gk20a_readl(g, | 5553 | obj_table = (isr_data.sub_chan < 4) ? gk20a_readl(g, |
| 5554 | gr_fe_object_table_r(isr_data.sub_chan)); | 5554 | gr_fe_object_table_r(isr_data.sub_chan)) : 0; |
| 5555 | isr_data.class_num = gr_fe_object_table_nvclass_v(obj_table); | 5555 | isr_data.class_num = gr_fe_object_table_nvclass_v(obj_table); |
| 5556 | 5556 | ||
| 5557 | isr_data.chid = | 5557 | isr_data.chid = |