summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-10-30 16:24:20 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-11-01 12:36:41 -0400
commit964a849d6176da362c375d7d72b94289e9b905de (patch)
treee54a5e66ebb066fe6be384ac77339d30ba66ecb0 /drivers/gpu
parentb8bfcd4358275be4a11405641defee46d4b33b6b (diff)
gpu: nvgpu: Use get_maxfreq HAL
Use the get_maxfreq HAL for filling max frequency for GPU characteristics. JIRA NVGPU-259 Change-Id: I754495ae83a5e513cc09497649f6bf4eee7057ad Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1588661 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index e4bfce7f..a4afba63 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -390,7 +390,6 @@ int gk20a_wait_for_idle(struct gk20a *g)
390int gk20a_init_gpu_characteristics(struct gk20a *g) 390int gk20a_init_gpu_characteristics(struct gk20a *g)
391{ 391{
392 struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; 392 struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics;
393 struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g));
394 393
395 gpu->L2_cache_size = g->ops.ltc.determine_L2_size_bytes(g); 394 gpu->L2_cache_size = g->ops.ltc.determine_L2_size_bytes(g);
396 gpu->on_board_video_memory_size = 0; /* integrated GPU */ 395 gpu->on_board_video_memory_size = 0; /* integrated GPU */
@@ -485,9 +484,8 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
485 484
486 gpu->map_buffer_batch_limit = 256; 485 gpu->map_buffer_batch_limit = 256;
487 486
488 if (platform->clk_round_rate) 487 if (g->ops.clk.get_maxrate)
489 gpu->max_freq = platform->clk_round_rate(dev_from_gk20a(g), 488 gpu->max_freq = g->ops.clk.get_maxrate(&g->clk);
490 UINT_MAX);
491 489
492 g->ops.gr.get_preemption_mode_flags(g, &g->gr.preemption_mode_rec); 490 g->ops.gr.get_preemption_mode_flags(g, &g->gr.preemption_mode_rec);
493 gpu->graphics_preemption_mode_flags = 491 gpu->graphics_preemption_mode_flags =