From afc470e867b7feb9338ccb086ace8989604683e0 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 4 Nov 2014 12:17:21 +0200 Subject: gpu: nvgpu: Do not call ELPG if disabled Do not call PMU ELPG calls if ELPG should be disabled. Also skips initialization of PMU ucode if PMU is disabled. Bug 1567274 Change-Id: Ia9cd3b553c358142ee05a1b0e0832f9412f7cf17 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/593335 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seshendra Gadagottu --- drivers/gpu/nvgpu/gk20a/gk20a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 276e5c3e..58108d97 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -820,7 +820,8 @@ static int gk20a_pm_finalize_poweron(struct device *dev) goto done; } - err = g->ops.pmu.prepare_ucode(g); + if (g->ops.pmu.prepare_ucode) + err = g->ops.pmu.prepare_ucode(g); if (err) { gk20a_err(dev, "failed to init pmu ucode"); goto done; -- cgit v1.2.2