diff options
author | Sam Payne <spayne@nvidia.com> | 2015-01-26 17:02:25 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-04-04 21:08:17 -0400 |
commit | ce3afaaaf6092f46b2db0f8835e4d4b9b46ef1a4 (patch) | |
tree | bd06822411f5601c5ea5c7a9059c1d2c7710c64e /drivers/gpu/nvgpu/gm20b | |
parent | f3a920cb01d1517db5432c8062b660d6b60eb4de (diff) |
gpu: nvgpu: disable ce2 interrupts when unhandled
ce2 interrupts enabled only on gk20a and gm20b when
interrupts are handled through hal
Change-Id: Ib570db8f5f41e71e768b95e781153ec8a5d20015
Signed-off-by: Sam Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/677447
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
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/fifo_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 |
4 files changed, 61 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c new file mode 100644 index 00000000..a90a9b5b --- /dev/null +++ b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.c | |||
@@ -0,0 +1,28 @@ | |||
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 new file mode 100644 index 00000000..10d7ef8c --- /dev/null +++ b/drivers/gpu/nvgpu/gm20b/ce2_gm20b.h | |||
@@ -0,0 +1,29 @@ | |||
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/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index 640448cb..6d186c10 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GM20B Fifo | 2 | * GM20B Fifo |
3 | * | 3 | * |
4 | * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2015, 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, |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 5dc0c212..d5a6e422 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
19 | 19 | ||
20 | #include "ltc_gm20b.h" | 20 | #include "ltc_gm20b.h" |
21 | #include "ce2_gm20b.h" | ||
21 | #include "gr_gm20b.h" | 22 | #include "gr_gm20b.h" |
22 | #include "ltc_gm20b.h" | 23 | #include "ltc_gm20b.h" |
23 | #include "fb_gm20b.h" | 24 | #include "fb_gm20b.h" |
@@ -81,7 +82,7 @@ static struct gpu_ops gm20b_ops = { | |||
81 | gm20b_blcg_pmu_load_gating_prod, | 82 | gm20b_blcg_pmu_load_gating_prod, |
82 | .pg_gr_load_gating_prod = | 83 | .pg_gr_load_gating_prod = |
83 | gr_gm20b_pg_gr_load_gating_prod, | 84 | gr_gm20b_pg_gr_load_gating_prod, |
84 | } | 85 | }, |
85 | }; | 86 | }; |
86 | 87 | ||
87 | int gm20b_init_hal(struct gk20a *g) | 88 | int gm20b_init_hal(struct gk20a *g) |
@@ -124,6 +125,7 @@ int gm20b_init_hal(struct gk20a *g) | |||
124 | gm20b_init_ltc(gops); | 125 | gm20b_init_ltc(gops); |
125 | gm20b_init_fb(gops); | 126 | gm20b_init_fb(gops); |
126 | gm20b_init_fifo(gops); | 127 | gm20b_init_fifo(gops); |
128 | gm20b_init_ce2(gops); | ||
127 | gm20b_init_gr_ctx(gops); | 129 | gm20b_init_gr_ctx(gops); |
128 | gm20b_init_mm(gops); | 130 | gm20b_init_mm(gops); |
129 | gm20b_init_pmu_ops(gops); | 131 | gm20b_init_pmu_ops(gops); |