From 7878824093972a6b8805dd8c00f1838e24a61ec0 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 18 Jun 2014 14:39:25 +0300 Subject: gpu: nvgpu: Separate PMU firmware load from init Separate the code to load PMU firmware from the software init. This allows folding ACR and non-ACR PMU software initialization sequences. Bug 200006956 Change-Id: I74b289747852167e8ebf1be63036c790ae634da4 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/424768 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/gk20a.c | 6 ++++++ 1 file changed, 6 insertions(+) (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 790b366c..5305f612 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -897,6 +897,12 @@ static int gk20a_pm_finalize_poweron(struct device *dev) goto done; } + err = g->ops.pmu.prepare_ucode(g); + if (err) { + gk20a_err(dev, "failed to init pmu ucode"); + goto done; + } + err = gk20a_init_pmu_support(g); if (err) { gk20a_err(dev, "failed to init gk20a pmu"); -- cgit v1.2.2