diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-03-18 15:28:23 -0700 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2015-06-05 15:07:37 -0700 |
| commit | d89af238e13dbd1f2a01cb5392902313ad367ef2 (patch) | |
| tree | adbf33bf52e9272c07d58412708d96850a99566d | |
| parent | 2966d1c9508d8c4685bac33dd76a79394fdc4d6e (diff) | |
gpu: nvgpu: Do not touch gr status mask
GR status disable mask was never set, so driver always disabled all
engines from status rollup.
Change-Id: I500a127be9253294f73d1f42ce89b886471a9117
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/719141
(cherry picked from commit 34a5ffe7e7dcc4df5f3a11848b828e96c43d2c4d)
Reviewed-on: http://git-master/r/752092
GVS: Gerrit_Virtual_Submit
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 37b47866b0a6..66ebfb9783f0 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -4235,10 +4235,6 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g) gk20a_writel(g, gr_exception2_r(), 0xFFFFFFFF); gk20a_writel(g, gr_exception2_en_r(), 0xFFFFFFFF); - /* ignore status from some units */ - data = gk20a_readl(g, gr_status_mask_r()); - gk20a_writel(g, gr_status_mask_r(), data & gr->status_disable_mask); - if (gr->sw_ready) gr_gk20a_load_zbc_table(g, gr); else diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 8a6df3d3229b..2a31aa0b830f 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h @@ -271,8 +271,6 @@ struct gr_gk20a { s32 max_used_color_index; s32 max_used_depth_index; - u32 status_disable_mask; - #define GR_CHANNEL_MAP_TLB_SIZE 2 /* must of power of 2 */ struct gr_channel_map_tlb_entry chid_tlb[GR_CHANNEL_MAP_TLB_SIZE]; u32 channel_tlb_flush_index; |