diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2016-06-02 08:08:37 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-04 18:21:35 -0400 |
commit | f99de40936236b4e8b00fa847f502c7b94af85c3 (patch) | |
tree | 0be307642c99a03e1807fbe5549e5c47fb6ded1e /drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |
parent | 608101dbfa1c99069ca2abe9d70a204419f8e719 (diff) |
gpu: nvgpu: WPR & PMU interface update
Update WPR interface & PMU interface
to support latest ACR/PMU ucode versions
Change-Id: I4d1bd7a5c43751e96c1db58832cd316006d56954
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1158070
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 51ffc552..d12c5987 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -1623,7 +1623,7 @@ void pmu_copy_to_dmem(struct pmu_gk20a *pmu, | |||
1623 | return; | 1623 | return; |
1624 | } | 1624 | } |
1625 | 1625 | ||
1626 | static int pmu_idle(struct pmu_gk20a *pmu) | 1626 | int pmu_idle(struct pmu_gk20a *pmu) |
1627 | { | 1627 | { |
1628 | struct gk20a *g = gk20a_from_pmu(pmu); | 1628 | struct gk20a *g = gk20a_from_pmu(pmu); |
1629 | unsigned long end_jiffies = jiffies + | 1629 | unsigned long end_jiffies = jiffies + |
@@ -1714,7 +1714,7 @@ void pmu_enable_irq(struct pmu_gk20a *pmu, bool enable) | |||
1714 | gk20a_dbg_fn("done"); | 1714 | gk20a_dbg_fn("done"); |
1715 | } | 1715 | } |
1716 | 1716 | ||
1717 | static int pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) | 1717 | int pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) |
1718 | { | 1718 | { |
1719 | struct gk20a *g = gk20a_from_pmu(pmu); | 1719 | struct gk20a *g = gk20a_from_pmu(pmu); |
1720 | 1720 | ||