summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index e9497ea7..dd63a105 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1653,10 +1653,10 @@ static inline bool nvgpu_is_timeouts_enabled(struct gk20a *g)
1653 return nvgpu_atomic_read(&g->timeouts_disabled_refcount) == 0; 1653 return nvgpu_atomic_read(&g->timeouts_disabled_refcount) == 0;
1654} 1654}
1655 1655
1656static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g) 1656static inline u32 gk20a_get_gr_idle_timeout(struct gk20a *g)
1657{ 1657{
1658 return nvgpu_is_timeouts_enabled(g) ? 1658 return nvgpu_is_timeouts_enabled(g) ?
1659 g->gr_idle_timeout_default : ULONG_MAX; 1659 g->gr_idle_timeout_default : UINT_MAX;
1660} 1660}
1661 1661
1662#define MULTICHAR_TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) 1662#define MULTICHAR_TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))