diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2016-03-31 17:57:20 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-20 16:38:13 -0400 |
commit | a21e56d584641202327f64741b06b1cd9633d0f6 (patch) | |
tree | e52766b071ec539f95b0fb5da459a8d015a830d1 /drivers/gpu/nvgpu/vgpu/gk20a | |
parent | ce0fe5082ebb8a7e0ca5a8992e17ae4547d4db5e (diff) |
gpu: nvgpu: vgpu: add support for VSM ioctls
Add virtualized support for NUM_VSMS and VSMS_MAPPING ioctls.
This requires adding an attribute request for the RM server, GPC0_TPC_COUNT
JIRASW EVLR-253
Change-Id: Icaab4fadbbc9eab5d00cf78132928686944162df
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: http://git-master/r/1130615
(cherry picked from commit 78514079382b0de48457db340e3479e99a012040)
Reviewed-on: http://git-master/r/1133865
(cherry picked from commit 27a8e645e2787a43d0073f0be6e8f64c0f183228)
Reviewed-on: http://git-master/r/1122553
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c b/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c index 0a2ca743..2cfe16da 100644 --- a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c +++ b/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -45,7 +45,35 @@ static void vgpu_gk20a_detect_sm_arch(struct gk20a *g) | |||
45 | gr_gpc0_tpc0_sm_arch_warp_count_v(v); | 45 | gr_gpc0_tpc0_sm_arch_warp_count_v(v); |
46 | } | 46 | } |
47 | 47 | ||
48 | static int vgpu_gk20a_init_fs_state(struct gk20a *g) | ||
49 | { | ||
50 | struct gr_gk20a *gr = &g->gr; | ||
51 | u32 tpc_index, gpc_index; | ||
52 | u32 sm_id = 0; | ||
53 | |||
54 | gk20a_dbg_fn(""); | ||
55 | |||
56 | for (tpc_index = 0; tpc_index < gr->max_tpc_per_gpc_count; | ||
57 | tpc_index++) { | ||
58 | for (gpc_index = 0; gpc_index < gr->gpc_count; gpc_index++) { | ||
59 | if (tpc_index < gr->gpc_tpc_count[gpc_index]) { | ||
60 | g->gr.sm_to_cluster[sm_id].tpc_index = | ||
61 | tpc_index; | ||
62 | g->gr.sm_to_cluster[sm_id].gpc_index = | ||
63 | gpc_index; | ||
64 | |||
65 | sm_id++; | ||
66 | } | ||
67 | } | ||
68 | } | ||
69 | |||
70 | gr->no_of_sm = sm_id; | ||
71 | |||
72 | return 0; | ||
73 | } | ||
74 | |||
48 | void vgpu_gk20a_init_gr_ops(struct gpu_ops *gops) | 75 | void vgpu_gk20a_init_gr_ops(struct gpu_ops *gops) |
49 | { | 76 | { |
50 | gops->gr.detect_sm_arch = vgpu_gk20a_detect_sm_arch; | 77 | gops->gr.detect_sm_arch = vgpu_gk20a_detect_sm_arch; |
78 | gops->gr.init_fs_state = vgpu_gk20a_init_fs_state; | ||
51 | } | 79 | } |