diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-11-04 05:17:21 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:02 -0400 |
commit | afc470e867b7feb9338ccb086ace8989604683e0 (patch) | |
tree | 3ee866fb4977be9d96e25ce76f9245ce2d777b02 /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | b3f575074b66e8af1a9943874f9782b793fa7edc (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/593335
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
820 | goto done; | 820 | goto done; |
821 | } | 821 | } |
822 | 822 | ||
823 | err = g->ops.pmu.prepare_ucode(g); | 823 | if (g->ops.pmu.prepare_ucode) |
824 | err = g->ops.pmu.prepare_ucode(g); | ||
824 | if (err) { | 825 | if (err) { |
825 | gk20a_err(dev, "failed to init pmu ucode"); | 826 | gk20a_err(dev, "failed to init pmu ucode"); |
826 | goto done; | 827 | goto done; |