From 1d9d7c04bbbaa38080c3c8f256546bd63f65d494 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 30 Aug 2018 15:18:11 -0700 Subject: gpu: nvgpu: Wait for empty always has GR enabled Whenever wait for empty HAL is called, GR is out of reset. Check for GR being out of reset was adding an extra dependency to MC, so just remove that code. JIRA NVGPU-964 Change-Id: Ic6d607fd2e29359a67896973517d8de6542029e9 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1813522 Reviewed-by: svc-misra-checker Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b') diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 2fb700f0..db6f5618 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c @@ -45,7 +45,6 @@ #include #include #include -#include #define GFXP_WFI_TIMEOUT_COUNT_DEFAULT 100000 @@ -1452,7 +1451,6 @@ int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms, u32 expect_delay) { u32 delay = expect_delay; - bool gr_enabled; bool ctxsw_active; bool gr_busy; u32 gr_status; @@ -1468,9 +1466,6 @@ int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms, only when gr_status is read */ gr_status = gk20a_readl(g, gr_status_r()); - gr_enabled = gk20a_readl(g, mc_enable_r()) & - mc_enable_pgraph_enabled_f(); - ctxsw_active = gr_status & 1<<7; activity0 = gk20a_readl(g, gr_activity_0_r()); @@ -1483,7 +1478,7 @@ int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms, activity2 == 0 && gr_activity_empty_or_preempted(activity4)); - if (!gr_enabled || (!gr_busy && !ctxsw_active)) { + if (!gr_busy && !ctxsw_active) { nvgpu_log_fn(g, "done"); return 0; } -- cgit v1.2.2