diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ce_gp10b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ce_gp10b.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c index 048a9ba0..76179b78 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c | |||
@@ -61,9 +61,9 @@ void gp10b_ce_isr(struct gk20a *g, u32 inst_id, u32 pri_base) | |||
61 | return; | 61 | return; |
62 | } | 62 | } |
63 | 63 | ||
64 | int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) | 64 | u32 gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) |
65 | { | 65 | { |
66 | int ops = 0; | 66 | u32 ops = 0; |
67 | u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id)); | 67 | u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id)); |
68 | 68 | ||
69 | nvgpu_log(g, gpu_dbg_intr, "ce nonstall isr %08x %08x\n", ce_intr, inst_id); | 69 | nvgpu_log(g, gpu_dbg_intr, "ce nonstall isr %08x %08x\n", ce_intr, inst_id); |
@@ -71,8 +71,8 @@ int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) | |||
71 | if (ce_intr & ce_intr_status_nonblockpipe_pending_f()) { | 71 | if (ce_intr & ce_intr_status_nonblockpipe_pending_f()) { |
72 | gk20a_writel(g, ce_intr_status_r(inst_id), | 72 | gk20a_writel(g, ce_intr_status_r(inst_id), |
73 | ce_intr_status_nonblockpipe_pending_f()); | 73 | ce_intr_status_nonblockpipe_pending_f()); |
74 | ops |= (gk20a_nonstall_ops_wakeup_semaphore | | 74 | ops |= (GK20A_NONSTALL_OPS_WAKEUP_SEMAPHORE | |
75 | gk20a_nonstall_ops_post_events); | 75 | GK20A_NONSTALL_OPS_POST_EVENTS); |
76 | } | 76 | } |
77 | 77 | ||
78 | return ops; | 78 | return ops; |
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.h b/drivers/gpu/nvgpu/gp10b/ce_gp10b.h index 7b747751..fbf5e6f8 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Pascal GPU series Copy Engine. | 2 | * Pascal GPU series Copy Engine. |
3 | * | 3 | * |
4 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -28,6 +28,6 @@ | |||
28 | #include "gk20a/tsg_gk20a.h" | 28 | #include "gk20a/tsg_gk20a.h" |
29 | 29 | ||
30 | void gp10b_ce_isr(struct gk20a *g, u32 inst_id, u32 pri_base); | 30 | void gp10b_ce_isr(struct gk20a *g, u32 inst_id, u32 pri_base); |
31 | int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base); | 31 | u32 gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base); |
32 | 32 | ||
33 | #endif /*__CE2_GP10B_H__*/ | 33 | #endif /*__CE2_GP10B_H__*/ |