diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 4f7468b3..2596d400 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <nvgpu/hw/gv11b/hw_fifo_gv11b.h> | 57 | #include <nvgpu/hw/gv11b/hw_fifo_gv11b.h> |
58 | #include <nvgpu/hw/gv11b/hw_proj_gv11b.h> | 58 | #include <nvgpu/hw/gv11b/hw_proj_gv11b.h> |
59 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> | 59 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> |
60 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | ||
61 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> | 60 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> |
62 | #include <nvgpu/hw/gv11b/hw_pbdma_gv11b.h> | 61 | #include <nvgpu/hw/gv11b/hw_pbdma_gv11b.h> |
63 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 62 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
@@ -2050,7 +2049,6 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms, | |||
2050 | u32 expect_delay) | 2049 | u32 expect_delay) |
2051 | { | 2050 | { |
2052 | u32 delay = expect_delay; | 2051 | u32 delay = expect_delay; |
2053 | bool gr_enabled; | ||
2054 | bool ctxsw_active; | 2052 | bool ctxsw_active; |
2055 | bool gr_busy; | 2053 | bool gr_busy; |
2056 | u32 gr_status; | 2054 | u32 gr_status; |
@@ -2066,9 +2064,6 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms, | |||
2066 | only when gr_status is read */ | 2064 | only when gr_status is read */ |
2067 | gr_status = gk20a_readl(g, gr_status_r()); | 2065 | gr_status = gk20a_readl(g, gr_status_r()); |
2068 | 2066 | ||
2069 | gr_enabled = gk20a_readl(g, mc_enable_r()) & | ||
2070 | mc_enable_pgraph_enabled_f(); | ||
2071 | |||
2072 | ctxsw_active = gr_status & 1<<7; | 2067 | ctxsw_active = gr_status & 1<<7; |
2073 | 2068 | ||
2074 | activity0 = gk20a_readl(g, gr_activity_0_r()); | 2069 | activity0 = gk20a_readl(g, gr_activity_0_r()); |
@@ -2081,7 +2076,7 @@ int gr_gv11b_wait_empty(struct gk20a *g, unsigned long duration_ms, | |||
2081 | activity2 == 0 && | 2076 | activity2 == 0 && |
2082 | gr_activity_empty_or_preempted(activity4)); | 2077 | gr_activity_empty_or_preempted(activity4)); |
2083 | 2078 | ||
2084 | if (!gr_enabled || (!gr_busy && !ctxsw_active)) { | 2079 | if (!gr_busy && !ctxsw_active) { |
2085 | nvgpu_log_fn(g, "done"); | 2080 | nvgpu_log_fn(g, "done"); |
2086 | return 0; | 2081 | return 0; |
2087 | } | 2082 | } |