diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h | 9 |
4 files changed, 14 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 03f61c33..626ed2bd 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -886,6 +886,9 @@ struct gpu_ops { | |||
886 | struct { | 886 | struct { |
887 | void (*falcon_hal_sw_init)(struct nvgpu_falcon *flcn); | 887 | void (*falcon_hal_sw_init)(struct nvgpu_falcon *flcn); |
888 | } falcon; | 888 | } falcon; |
889 | struct { | ||
890 | void (*isr)(struct gk20a *g); | ||
891 | } priv_ring; | ||
889 | }; | 892 | }; |
890 | 893 | ||
891 | struct nvgpu_bios_ucode { | 894 | struct nvgpu_bios_ucode { |
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index 3dbe856d..729a277f 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include "dbg_gpu_gk20a.h" | 35 | #include "dbg_gpu_gk20a.h" |
36 | #include "css_gr_gk20a.h" | 36 | #include "css_gr_gk20a.h" |
37 | #include "pramin_gk20a.h" | 37 | #include "pramin_gk20a.h" |
38 | #include "priv_ring_gk20a.h" | ||
38 | 39 | ||
39 | #include <nvgpu/log.h> | 40 | #include <nvgpu/log.h> |
40 | #include <nvgpu/bug.h> | 41 | #include <nvgpu/bug.h> |
@@ -155,6 +156,7 @@ int gk20a_init_hal(struct gk20a *g) | |||
155 | gops->pmupstate = false; | 156 | gops->pmupstate = false; |
156 | gk20a_init_bus(gops); | 157 | gk20a_init_bus(gops); |
157 | gk20a_init_mc(gops); | 158 | gk20a_init_mc(gops); |
159 | gk20a_init_priv_ring(gops); | ||
158 | gk20a_init_ltc(gops); | 160 | gk20a_init_ltc(gops); |
159 | gk20a_init_gr_ops(gops); | 161 | gk20a_init_gr_ops(gops); |
160 | gk20a_init_fecs_trace_ops(gops); | 162 | gk20a_init_fecs_trace_ops(gops); |
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c index 96e21d2d..2f837bfc 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | |||
@@ -94,3 +94,8 @@ void gk20a_priv_ring_isr(struct gk20a *g) | |||
94 | if (retry <= 0) | 94 | if (retry <= 0) |
95 | nvgpu_warn(g, "priv ringmaster cmd ack too many retries"); | 95 | nvgpu_warn(g, "priv ringmaster cmd ack too many retries"); |
96 | } | 96 | } |
97 | |||
98 | void gk20a_init_priv_ring(struct gpu_ops *gops) | ||
99 | { | ||
100 | gops->priv_ring.isr = gk20a_priv_ring_isr; | ||
101 | } | ||
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h index 8a6320d7..61780288 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h | |||
@@ -11,15 +11,14 @@ | |||
11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
13 | * more details. | 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 | */ | 14 | */ |
19 | #ifndef __PRIV_RING_GK20A_H__ | 15 | #ifndef __PRIV_RING_GK20A_H__ |
20 | #define __PRIV_RING_GK20A_H__ | 16 | #define __PRIV_RING_GK20A_H__ |
21 | 17 | ||
22 | void gk20a_enable_priv_ring(struct gk20a *g); | 18 | struct gpu_ops; |
19 | |||
23 | void gk20a_priv_ring_isr(struct gk20a *g); | 20 | void gk20a_priv_ring_isr(struct gk20a *g); |
21 | void gk20a_enable_priv_ring(struct gk20a *g); | ||
22 | void gk20a_init_priv_ring(struct gpu_ops *gops); | ||
24 | 23 | ||
25 | #endif /*__PRIV_RING_GK20A_H__*/ | 24 | #endif /*__PRIV_RING_GK20A_H__*/ |