diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-03-09 18:12:09 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-14 14:47:06 -0400 |
commit | 8c9b64dc4249b2785c01485eb9b499c41cc7ed78 (patch) | |
tree | e66b4ece004d5782aeda813fce9fc9e3b5bb28cd /drivers/gpu/nvgpu/gp106 | |
parent | e4a131a98d47740098c554425c532a2e3e48274d (diff) |
gpu: nvgpu: Do not query SEC2 freq from CCF
dGPU's SEC2 is passed frequency, which is queried with
clk_get_rate(). dGPU clocks are not represented in CCF, so the query
always returned an error. The value is ignored, so this went
unnoticed.
Replace the call to clk_get_rate() by just hard coding 0 as the clock
rate.
Change-Id: I86fec3726d2b6683cdadd86cab1672f3b199378f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1319068
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Navneet Kumar <navneetk@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/sec2_gp106.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c index 92f99165..0032bce7 100644 --- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c +++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c | |||
@@ -12,7 +12,6 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/delay.h> /* for udelay */ | 14 | #include <linux/delay.h> /* for udelay */ |
15 | #include <linux/clk.h> | ||
16 | 15 | ||
17 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
18 | #include "gk20a/pmu_gk20a.h" | 17 | #include "gk20a/pmu_gk20a.h" |
@@ -289,7 +288,6 @@ void init_pmu_setup_hw1(struct gk20a *g) | |||
289 | { | 288 | { |
290 | struct mm_gk20a *mm = &g->mm; | 289 | struct mm_gk20a *mm = &g->mm; |
291 | struct pmu_gk20a *pmu = &g->pmu; | 290 | struct pmu_gk20a *pmu = &g->pmu; |
292 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | ||
293 | 291 | ||
294 | /* PMU TRANSCFG */ | 292 | /* PMU TRANSCFG */ |
295 | /* setup apertures - virtual */ | 293 | /* setup apertures - virtual */ |
@@ -322,8 +320,7 @@ void init_pmu_setup_hw1(struct gk20a *g) | |||
322 | pwr_pmu_new_instblk_target_fb_f())); | 320 | pwr_pmu_new_instblk_target_fb_f())); |
323 | 321 | ||
324 | /*Copying pmu cmdline args*/ | 322 | /*Copying pmu cmdline args*/ |
325 | g->ops.pmu_ver.set_pmu_cmdline_args_cpu_freq(pmu, | 323 | g->ops.pmu_ver.set_pmu_cmdline_args_cpu_freq(pmu, 0); |
326 | clk_get_rate(platform->clk[1])); | ||
327 | g->ops.pmu_ver.set_pmu_cmdline_args_secure_mode(pmu, 1); | 324 | g->ops.pmu_ver.set_pmu_cmdline_args_secure_mode(pmu, 1); |
328 | g->ops.pmu_ver.set_pmu_cmdline_args_trace_size( | 325 | g->ops.pmu_ver.set_pmu_cmdline_args_trace_size( |
329 | pmu, GK20A_PMU_TRACE_BUFSIZE); | 326 | pmu, GK20A_PMU_TRACE_BUFSIZE); |