summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
index 08198776..07cdc9e5 100644
--- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
@@ -16,11 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */ 17 */
18 18
19#include <linux/delay.h> /* for mdelay */
20
21#include "gk20a.h" 19#include "gk20a.h"
22 20
23#include <nvgpu/log.h> 21#include <nvgpu/log.h>
22#include <nvgpu/timers.h>
24 23
25#include <nvgpu/hw/gk20a/hw_mc_gk20a.h> 24#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
26#include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> 25#include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h>
@@ -62,7 +61,7 @@ static void gk20a_reset_priv_ring(struct gk20a *g)
62 61
63 gk20a_writel(g, pri_ringmaster_global_ctl_r(), 62 gk20a_writel(g, pri_ringmaster_global_ctl_r(),
64 pri_ringmaster_global_ctl_ring_reset_asserted_f()); 63 pri_ringmaster_global_ctl_ring_reset_asserted_f());
65 udelay(20); 64 nvgpu_udelay(20);
66 gk20a_writel(g, pri_ringmaster_global_ctl_r(), 65 gk20a_writel(g, pri_ringmaster_global_ctl_r(),
67 pri_ringmaster_global_ctl_ring_reset_deasserted_f()); 66 pri_ringmaster_global_ctl_ring_reset_deasserted_f());
68 67
@@ -119,7 +118,7 @@ void gk20a_priv_ring_isr(struct gk20a *g)
119 do { 118 do {
120 cmd = pri_ringmaster_command_cmd_v( 119 cmd = pri_ringmaster_command_cmd_v(
121 gk20a_readl(g, pri_ringmaster_command_r())); 120 gk20a_readl(g, pri_ringmaster_command_r()));
122 usleep_range(20, 40); 121 nvgpu_usleep_range(20, 40);
123 } while (cmd != pri_ringmaster_command_cmd_no_cmd_v() && --retry); 122 } while (cmd != pri_ringmaster_command_cmd_no_cmd_v() && --retry);
124 123
125 if (retry <= 0) 124 if (retry <= 0)