diff options
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_arb.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/clk_gp106.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index aea32cb8..1b974d17 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -461,7 +461,7 @@ static int nvgpu_clk_arb_update_vf_table(struct nvgpu_clk_arb *arb) | |||
461 | struct gk20a *g = arb->g; | 461 | struct gk20a *g = arb->g; |
462 | struct nvgpu_clk_vf_table *table; | 462 | struct nvgpu_clk_vf_table *table; |
463 | 463 | ||
464 | int i, j; | 464 | u32 i, j; |
465 | int status = 0; | 465 | int status = 0; |
466 | u32 gpc2clk_voltuv = 0, mclk_voltuv = 0; | 466 | u32 gpc2clk_voltuv = 0, mclk_voltuv = 0; |
467 | u32 gpc2clk_voltuv_sram = 0, mclk_voltuv_sram = 0; | 467 | u32 gpc2clk_voltuv_sram = 0, mclk_voltuv_sram = 0; |
@@ -484,14 +484,14 @@ static int nvgpu_clk_arb_update_vf_table(struct nvgpu_clk_arb *arb) | |||
484 | &mclk_min, &mclk_max) < 0) | 484 | &mclk_min, &mclk_max) < 0) |
485 | goto exit_vf_table; | 485 | goto exit_vf_table; |
486 | 486 | ||
487 | if (!clk_domain_get_f_points(arb->g, NVGPU_GPU_CLK_DOMAIN_GPC2CLK, | 487 | if (clk_domain_get_f_points(arb->g, NVGPU_GPU_CLK_DOMAIN_GPC2CLK, |
488 | &table->gpc2clk_num_points, arb->gpc2clk_f_points) < 0) { | 488 | &table->gpc2clk_num_points, arb->gpc2clk_f_points)) { |
489 | gk20a_err(dev_from_gk20a(g), | 489 | gk20a_err(dev_from_gk20a(g), |
490 | "failed to fetch GPC2CLK frequency points"); | 490 | "failed to fetch GPC2CLK frequency points"); |
491 | goto exit_vf_table; | 491 | goto exit_vf_table; |
492 | } | 492 | } |
493 | if (clk_domain_get_f_points(arb->g, NVGPU_GPU_CLK_DOMAIN_MCLK, | 493 | if (clk_domain_get_f_points(arb->g, NVGPU_GPU_CLK_DOMAIN_MCLK, |
494 | &table->mclk_num_points, arb->mclk_f_points) < 0) { | 494 | &table->mclk_num_points, arb->mclk_f_points)) { |
495 | gk20a_err(dev_from_gk20a(g), | 495 | gk20a_err(dev_from_gk20a(g), |
496 | "failed to fetch MCLK frequency points"); | 496 | "failed to fetch MCLK frequency points"); |
497 | goto exit_vf_table; | 497 | goto exit_vf_table; |
@@ -767,7 +767,7 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work) | |||
767 | debug->switch_std = 0; | 767 | debug->switch_std = 0; |
768 | } else { | 768 | } else { |
769 | s64 prev_avg; | 769 | s64 prev_avg; |
770 | u64 curr = (t1-t0)/1000; | 770 | s64 curr = (t1-t0)/1000; |
771 | 771 | ||
772 | debug->switch_max = curr > debug->switch_max ? | 772 | debug->switch_max = curr > debug->switch_max ? |
773 | curr : debug->switch_max; | 773 | curr : debug->switch_max; |
@@ -1014,7 +1014,7 @@ static void nvgpu_clk_arb_find_vf_point(struct nvgpu_clk_arb *arb, | |||
1014 | u32 gpc2clk_voltuv, gpc2clk_voltuv_sram; | 1014 | u32 gpc2clk_voltuv, gpc2clk_voltuv_sram; |
1015 | u32 mclk_voltuv, mclk_voltuv_sram; | 1015 | u32 mclk_voltuv, mclk_voltuv_sram; |
1016 | struct nvgpu_clk_vf_table *table; | 1016 | struct nvgpu_clk_vf_table *table; |
1017 | int index; | 1017 | u32 index; |
1018 | 1018 | ||
1019 | gpc2clk_target = *gpc2clk; | 1019 | gpc2clk_target = *gpc2clk; |
1020 | mclk_target = *mclk; | 1020 | mclk_target = *mclk; |
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 2a32690d..0e9f8d3a 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c | |||
@@ -51,7 +51,7 @@ static u16 gp106_clk_get_rate(struct gk20a *g, u32 api_domain) | |||
51 | { | 51 | { |
52 | struct clk_gk20a *clk = &g->clk; | 52 | struct clk_gk20a *clk = &g->clk; |
53 | u32 freq_khz; | 53 | u32 freq_khz; |
54 | int i; | 54 | u32 i; |
55 | struct namemap_cfg *c = NULL; | 55 | struct namemap_cfg *c = NULL; |
56 | 56 | ||
57 | for (i = 0; i < clk->namemap_num; i++) { | 57 | for (i = 0; i < clk->namemap_num; i++) { |