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

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 1763e2d92de46635be8b44c15cb9003b4657e828..475ac2efe7410fcd908eba0b2f57d8d50f1f8d19 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4214,10 +4214,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);
-
        gr_gk20a_load_zbc_table(g, gr);
 
        g->ops.ltc.init_cbc(g, gr);

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index eac710d1185cb8fe1d1230df8592837793733cb4..59176af8d123e3e78091476c5b2088d0ca275920 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -279,8 +279,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;