From 7fac794e998ddafee90e1e6ad550ac4da6c85896 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 14 Mar 2017 13:10:24 -0700 Subject: gpu: nvgpu: Remove use of PM runtime in VPR fetch VPR fetch is called only from code which already has GPU powered on. Skip calling PM runtime. Change-Id: I8f90f1afab150e81ad16a157cfe063848a3e4fc1 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1320732 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Thomas Fleury Reviewed-by: Konsta Holtta --- drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 8f5d1e10..cd1a106d 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c @@ -13,7 +13,6 @@ * more details. */ -#include #include #include "gk20a/gk20a.h" @@ -50,27 +49,14 @@ static int gm20b_mm_mmu_vpr_info_fetch_wait(struct gk20a *g, int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g) { - int ret = 0; - - gk20a_busy_noresume(g->dev); -#ifdef CONFIG_PM - if (!pm_runtime_active(g->dev)) - goto fail; -#endif - if (gm20b_mm_mmu_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT)) { - ret = -ETIME; - goto fail; + return -ETIME; } gk20a_writel(g, fb_mmu_vpr_info_r(), fb_mmu_vpr_info_fetch_true_v()); - ret = gm20b_mm_mmu_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT); - -fail: - pm_runtime_put(g->dev); - return ret; + return gm20b_mm_mmu_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT); } static bool gm20b_mm_mmu_debug_mode_enabled(struct gk20a *g) -- cgit v1.2.2