diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-11-10 03:34:24 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:14 -0400 |
commit | c0668f05ea1e2429444d6aad2a40dda81aba7ec8 (patch) | |
tree | e022679a8f6690d16d3c47ebd77021075ce914d3 /drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h | |
parent | 3a504842cd2696bd2feb496f4f4555ace82b4ab1 (diff) |
gpu: nvgpu: Retrieve intr & reset id from HW
Query interrupt number and reset id from HW. Use the number
from HW when enabling and detecting interrupts.
Bug 200036089
Bug 1567274
Change-Id: If9cb4db79a19dcb193ba7ad9db7081f4fe1ab433
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/600988
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h index ab527d25..f3ca7498 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -98,6 +98,14 @@ static inline u32 top_device_info_runlist_enum_v(u32 r) | |||
98 | { | 98 | { |
99 | return (r >> 21) & 0xf; | 99 | return (r >> 21) & 0xf; |
100 | } | 100 | } |
101 | static inline u32 top_device_info_intr_enum_v(u32 r) | ||
102 | { | ||
103 | return (r >> 15) & 0x1f; | ||
104 | } | ||
105 | static inline u32 top_device_info_reset_enum_v(u32 r) | ||
106 | { | ||
107 | return (r >> 9) & 0x1f; | ||
108 | } | ||
101 | static inline u32 top_device_info_type_enum_v(u32 r) | 109 | static inline u32 top_device_info_type_enum_v(u32 r) |
102 | { | 110 | { |
103 | return (r >> 2) & 0x1fffffff; | 111 | return (r >> 2) & 0x1fffffff; |