diff options
author | Deepak Goyal <dgoyal@nvidia.com> | 2017-06-08 01:51:52 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-08 10:54:24 -0400 |
commit | 1dfcf1833ba3e8fa58d0ad6ecb189db32c6b986f (patch) | |
tree | 4bf591fb2b7e07cf0c008092615953c6c21963eb /drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |
parent | 0ad7f1d9aa18d959abf3cba6ca4e532fc9246a31 (diff) |
gpu: nvgpu: Update PMU firmware version.
This patch also updates PMU cmdline args as
required by updated firmware.
GPUT19x-30
Change-Id: I44214007046081a44acc7284eb2854d0548a8da8
Signed-off-by: Deepak Goyal <dgoyal@nvidia.com>
Reviewed-on: http://git-master/r/1498188
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index f296b57c..4e416f67 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -205,6 +205,11 @@ static u32 pmu_cmdline_size_v5(struct nvgpu_pmu *pmu) | |||
205 | return sizeof(struct pmu_cmdline_args_v5); | 205 | return sizeof(struct pmu_cmdline_args_v5); |
206 | } | 206 | } |
207 | 207 | ||
208 | static u32 pmu_cmdline_size_v6(struct nvgpu_pmu *pmu) | ||
209 | { | ||
210 | return sizeof(struct pmu_cmdline_args_v6); | ||
211 | } | ||
212 | |||
208 | static void set_pmu_cmdline_args_cpufreq_v5(struct nvgpu_pmu *pmu, u32 freq) | 213 | static void set_pmu_cmdline_args_cpufreq_v5(struct nvgpu_pmu *pmu, u32 freq) |
209 | { | 214 | { |
210 | pmu->args_v5.cpu_freq_hz = 204000000; | 215 | pmu->args_v5.cpu_freq_hz = 204000000; |
@@ -1586,7 +1591,7 @@ int gk20a_init_pmu(struct nvgpu_pmu *pmu) | |||
1586 | g->ops.pmu_ver.cmd_id_zbc_table_update = 16; | 1591 | g->ops.pmu_ver.cmd_id_zbc_table_update = 16; |
1587 | g->ops.pmu_ver.is_pmu_zbc_save_supported = false; | 1592 | g->ops.pmu_ver.is_pmu_zbc_save_supported = false; |
1588 | g->ops.pmu_ver.get_pmu_cmdline_args_size = | 1593 | g->ops.pmu_ver.get_pmu_cmdline_args_size = |
1589 | pmu_cmdline_size_v5; | 1594 | pmu_cmdline_size_v6; |
1590 | g->ops.pmu_ver.set_pmu_cmdline_args_cpu_freq = | 1595 | g->ops.pmu_ver.set_pmu_cmdline_args_cpu_freq = |
1591 | set_pmu_cmdline_args_cpufreq_v5; | 1596 | set_pmu_cmdline_args_cpufreq_v5; |
1592 | g->ops.pmu_ver.set_pmu_cmdline_args_secure_mode = | 1597 | g->ops.pmu_ver.set_pmu_cmdline_args_secure_mode = |