diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ce2_gm20b.c | 28 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ce2_gm20b.h | 29 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 8 |
3 files changed, 6 insertions, 59 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c deleted file mode 100644 index a90a9b5b..00000000 --- a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /* | ||
2 | * GK20A Graphics Copy Engine (gr host) | ||
3 | * | ||
4 | * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
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, | ||
8 | * version 2, as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
13 | * more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License along with | ||
16 | * this program; if not, write to the Free Software Foundation, Inc., | ||
17 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
18 | */ | ||
19 | |||
20 | /*TODO: remove uncecessary */ | ||
21 | #include "gk20a/gk20a.h" | ||
22 | #include "ce2_gm20b.h" | ||
23 | |||
24 | void gm20b_init_ce2(struct gpu_ops *gops) | ||
25 | { | ||
26 | gops->ce2.isr_stall = gk20a_ce2_isr; | ||
27 | gops->ce2.isr_nonstall = gk20a_ce2_nonstall_isr; | ||
28 | } | ||
diff --git a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h deleted file mode 100644 index 10d7ef8c..00000000 --- a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * drivers/video/tegra/host/gk20a/fifo_gk20a.h | ||
3 | * | ||
4 | * GK20A graphics copy engine (gr host) | ||
5 | * | ||
6 | * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify it | ||
9 | * under the terms and conditions of the GNU General Public License, | ||
10 | * version 2, as published by the Free Software Foundation. | ||
11 | * | ||
12 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
13 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
14 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
15 | * more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License along with | ||
18 | * this program; if not, write to the Free Software Foundation, Inc., | ||
19 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
20 | */ | ||
21 | #ifndef __CE2_GM20B_H__ | ||
22 | #define __CE2_GM20B_H__ | ||
23 | |||
24 | #include "gk20a/channel_gk20a.h" | ||
25 | #include "gk20a/tsg_gk20a.h" | ||
26 | |||
27 | void gm20b_init_ce2(struct gpu_ops *gops); | ||
28 | |||
29 | #endif /*__CE2_GM20B_H__*/ | ||
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 228e1a97..c89f3746 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -14,6 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
17 | #include "gk20a/ce2_gk20a.h" | ||
17 | #include "gk20a/dbg_gpu_gk20a.h" | 18 | #include "gk20a/dbg_gpu_gk20a.h" |
18 | #include "gk20a/fifo_gk20a.h" | 19 | #include "gk20a/fifo_gk20a.h" |
19 | #include "gk20a/css_gr_gk20a.h" | 20 | #include "gk20a/css_gr_gk20a.h" |
@@ -24,7 +25,6 @@ | |||
24 | #include "gk20a/regops_gk20a.h" | 25 | #include "gk20a/regops_gk20a.h" |
25 | 26 | ||
26 | #include "ltc_gm20b.h" | 27 | #include "ltc_gm20b.h" |
27 | #include "ce2_gm20b.h" | ||
28 | #include "gr_gm20b.h" | 28 | #include "gr_gm20b.h" |
29 | #include "ltc_gm20b.h" | 29 | #include "ltc_gm20b.h" |
30 | #include "fb_gm20b.h" | 30 | #include "fb_gm20b.h" |
@@ -158,6 +158,10 @@ static const struct gpu_ops gm20b_ops = { | |||
158 | .sync_debugfs = gm20b_ltc_sync_debugfs, | 158 | .sync_debugfs = gm20b_ltc_sync_debugfs, |
159 | #endif | 159 | #endif |
160 | }, | 160 | }, |
161 | .ce2 = { | ||
162 | .isr_stall = gk20a_ce2_isr, | ||
163 | .isr_nonstall = gk20a_ce2_nonstall_isr, | ||
164 | }, | ||
161 | .clock_gating = { | 165 | .clock_gating = { |
162 | .slcg_bus_load_gating_prod = | 166 | .slcg_bus_load_gating_prod = |
163 | gm20b_slcg_bus_load_gating_prod, | 167 | gm20b_slcg_bus_load_gating_prod, |
@@ -332,6 +336,7 @@ int gm20b_init_hal(struct gk20a *g) | |||
332 | u32 val; | 336 | u32 val; |
333 | 337 | ||
334 | gops->ltc = gm20b_ops.ltc; | 338 | gops->ltc = gm20b_ops.ltc; |
339 | gops->ce2 = gm20b_ops.ce2; | ||
335 | gops->clock_gating = gm20b_ops.clock_gating; | 340 | gops->clock_gating = gm20b_ops.clock_gating; |
336 | gops->fifo = gm20b_ops.fifo; | 341 | gops->fifo = gm20b_ops.fifo; |
337 | gops->mc = gm20b_ops.mc; | 342 | gops->mc = gm20b_ops.mc; |
@@ -384,7 +389,6 @@ int gm20b_init_hal(struct gk20a *g) | |||
384 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; | 389 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; |
385 | gm20b_init_gr(g); | 390 | gm20b_init_gr(g); |
386 | gm20b_init_fb(gops); | 391 | gm20b_init_fb(gops); |
387 | gm20b_init_ce2(gops); | ||
388 | gm20b_init_gr_ctx(gops); | 392 | gm20b_init_gr_ctx(gops); |
389 | gm20b_init_mm(gops); | 393 | gm20b_init_mm(gops); |
390 | gm20b_init_pmu_ops(g); | 394 | gm20b_init_pmu_ops(g); |