summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c7
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.h2
2 files changed, 7 insertions, 2 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
208static u32 pmu_cmdline_size_v6(struct nvgpu_pmu *pmu)
209{
210 return sizeof(struct pmu_cmdline_args_v6);
211}
212
208static void set_pmu_cmdline_args_cpufreq_v5(struct nvgpu_pmu *pmu, u32 freq) 213static 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 =
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index 3941d90f..24bc5822 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
@@ -30,7 +30,7 @@ struct nvgpu_firmware;
30 30
31#define ZBC_MASK(i) (~(~(0) << ((i)+1)) & 0xfffe) 31#define ZBC_MASK(i) (~(~(0) << ((i)+1)) & 0xfffe)
32 32
33#define APP_VERSION_NC_3 21688026 33#define APP_VERSION_NC_3 22204331
34#define APP_VERSION_NC_2 20429989 34#define APP_VERSION_NC_2 20429989
35#define APP_VERSION_NC_1 20313802 35#define APP_VERSION_NC_1 20313802
36#define APP_VERSION_NC_0 20360931 36#define APP_VERSION_NC_0 20360931