summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-06-22 15:58:43 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-30 21:34:58 -0400
commit82c0c96290602b1baf296133c7f55ae1848e433a (patch)
tree1f32dc8571ce777c50984be1194c68ddeea73b38 /drivers/gpu/nvgpu/vgpu
parent3ffcadc8dd6152d4ce2677b4e5d8e043a3df58ac (diff)
gpu: nvgpu: Remove gk20a support
Remove gk20a support. Leave only gk20a code which is reused by other GPUs. JIRA NVGPU-38 Change-Id: I3d5f2bc9f71cd9f161e64436561a5eadd5786a3b Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master/r/1507927 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r--drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c47
-rw-r--r--drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.h21
-rw-r--r--drivers/gpu/nvgpu/vgpu/gk20a/vgpu_hal_gk20a.c29
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.c5
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.h1
5 files changed, 0 insertions, 103 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c b/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c
deleted file mode 100644
index 23da728e..00000000
--- a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.c
+++ /dev/null
@@ -1,47 +0,0 @@
1/*
2 * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved.
3 *
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,
6 * version 2, as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope it will be useful, but WITHOUT
9 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
11 * more details.
12 */
13
14#include "gk20a/gk20a.h"
15#include "vgpu_gr_gk20a.h"
16
17static int vgpu_gk20a_init_fs_state(struct gk20a *g)
18{
19 struct gr_gk20a *gr = &g->gr;
20 u32 tpc_index, gpc_index;
21 u32 sm_id = 0;
22
23 gk20a_dbg_fn("");
24
25 for (tpc_index = 0; tpc_index < gr->max_tpc_per_gpc_count;
26 tpc_index++) {
27 for (gpc_index = 0; gpc_index < gr->gpc_count; gpc_index++) {
28 if (tpc_index < gr->gpc_tpc_count[gpc_index]) {
29 g->gr.sm_to_cluster[sm_id].tpc_index =
30 tpc_index;
31 g->gr.sm_to_cluster[sm_id].gpc_index =
32 gpc_index;
33
34 sm_id++;
35 }
36 }
37 }
38
39 gr->no_of_sm = sm_id;
40
41 return 0;
42}
43
44void vgpu_gk20a_init_gr_ops(struct gpu_ops *gops)
45{
46 gops->gr.init_fs_state = vgpu_gk20a_init_fs_state;
47}
diff --git a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.h b/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.h
deleted file mode 100644
index bb80aff8..00000000
--- a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_gr_gk20a.h
+++ /dev/null
@@ -1,21 +0,0 @@
1/*
2 * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
3 *
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,
6 * version 2, as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope it will be useful, but WITHOUT
9 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
11 * more details.
12 */
13
14#ifndef __VGPU_GR_GK20A_H__
15#define __VGPU_GR_GK20A_H__
16
17#include "gk20a/gk20a.h"
18
19void vgpu_gk20a_init_gr_ops(struct gpu_ops *gops);
20
21#endif
diff --git a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_hal_gk20a.c b/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_hal_gk20a.c
deleted file mode 100644
index aeeb2ad9..00000000
--- a/drivers/gpu/nvgpu/vgpu/gk20a/vgpu_hal_gk20a.c
+++ /dev/null
@@ -1,29 +0,0 @@
1/*
2 * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
3 *
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,
6 * version 2, as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope it will be useful, but WITHOUT
9 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
11 * more details.
12 */
13
14#include "gk20a/hal_gk20a.h"
15#include "vgpu/vgpu.h"
16#include "vgpu_gr_gk20a.h"
17
18int vgpu_gk20a_init_hal(struct gk20a *g)
19{
20 int err;
21
22 err = gk20a_init_hal(g);
23 if (err)
24 return err;
25 vgpu_init_hal_common(g);
26 vgpu_gk20a_init_gr_ops(&g->ops);
27
28 return 0;
29}
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index c4647e29..d41c0abb 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -29,7 +29,6 @@
29#include "vgpu/vgpu.h" 29#include "vgpu/vgpu.h"
30#include "vgpu/fecs_trace_vgpu.h" 30#include "vgpu/fecs_trace_vgpu.h"
31#include "vgpu/clk_vgpu.h" 31#include "vgpu/clk_vgpu.h"
32#include "gk20a/hal_gk20a.h"
33#include "gk20a/ctxsw_trace_gk20a.h" 32#include "gk20a/ctxsw_trace_gk20a.h"
34#include "gk20a/tsg_gk20a.h" 33#include "gk20a/tsg_gk20a.h"
35#include "gk20a/gk20a_scale.h" 34#include "gk20a/gk20a_scale.h"
@@ -451,10 +450,6 @@ static int vgpu_init_hal(struct gk20a *g)
451 int err; 450 int err;
452 451
453 switch (ver) { 452 switch (ver) {
454 case GK20A_GPUID_GK20A:
455 gk20a_dbg_info("gk20a detected");
456 err = vgpu_gk20a_init_hal(g);
457 break;
458 case GK20A_GPUID_GM20B: 453 case GK20A_GPUID_GM20B:
459 case GK20A_GPUID_GM20B_B: 454 case GK20A_GPUID_GM20B_B:
460 gk20a_dbg_info("gm20b detected"); 455 gk20a_dbg_info("gm20b detected");
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h
index ec04c6f7..31ecb737 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.h
@@ -102,7 +102,6 @@ int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in,
102 size_t size_out); 102 size_t size_out);
103 103
104void vgpu_init_hal_common(struct gk20a *g); 104void vgpu_init_hal_common(struct gk20a *g);
105int vgpu_gk20a_init_hal(struct gk20a *g);
106int vgpu_gm20b_init_hal(struct gk20a *g); 105int vgpu_gm20b_init_hal(struct gk20a *g);
107int vgpu_gp10b_init_hal(struct gk20a *g); 106int vgpu_gp10b_init_hal(struct gk20a *g);
108 107