summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c3
-rw-r--r--include/uapi/linux/nvgpu.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 1000eba2..4ddb244b 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1962,6 +1962,7 @@ int gk20a_do_unidle(void)
1962int gk20a_init_gpu_characteristics(struct gk20a *g) 1962int gk20a_init_gpu_characteristics(struct gk20a *g)
1963{ 1963{
1964 struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; 1964 struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics;
1965 struct gk20a_platform *platform = platform_get_drvdata(g->dev);
1965 1966
1966 gpu->L2_cache_size = g->ops.ltc.determine_L2_size_bytes(g); 1967 gpu->L2_cache_size = g->ops.ltc.determine_L2_size_bytes(g);
1967 gpu->on_board_video_memory_size = 0; /* integrated GPU */ 1968 gpu->on_board_video_memory_size = 0; /* integrated GPU */
@@ -2029,6 +2030,8 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
2029 2030
2030 gpu->map_buffer_batch_limit = 256; 2031 gpu->map_buffer_batch_limit = 256;
2031 2032
2033 gpu->max_freq = platform->clk_round_rate(g->dev, UINT_MAX);
2034
2032 return 0; 2035 return 0;
2033} 2036}
2034 2037
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 1172a07e..984d1319 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * NVGPU Public Interface Header 2 * NVGPU Public Interface Header
3 * 3 *
4 * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2011-2016, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -179,6 +179,8 @@ struct nvgpu_gpu_characteristics {
179 * num_maps */ 179 * num_maps */
180 __u32 map_buffer_batch_limit; 180 __u32 map_buffer_batch_limit;
181 181
182 __u64 max_freq;
183
182 /* Notes: 184 /* Notes:
183 - This struct can be safely appended with new fields. However, always 185 - This struct can be safely appended with new fields. However, always
184 keep the structure size multiple of 8 and make sure that the binary 186 keep the structure size multiple of 8 and make sure that the binary