diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-13 11:27:30 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-06-14 07:50:56 -0400 |
commit | 1409d216e536f742700f1ef23a17481509024799 (patch) | |
tree | 0a27b81bd0fb71ea1e6f32075568fc4937fbe8f1 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | edd080b05ab118307c7c7b01426ea1e7c1cc9be7 (diff) |
gpu: nvgpu: Fix gk20a_busy() in debug dump
When debug dump is called from an interrupt thread, we do not want
to call gk20a_busy() because it causes race in case rail gating is
being engaged at the same time. It has to be called from all debugfs
paths.
Bug 200198908
Bug 1770522
Change-Id: I7eda7d029b0a59cce0320ecc1b750dc2f4d7ccf0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1163440
GVS: Gerrit_Virtual_Submit
Tested-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 1c129743..4ede8982 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1099,8 +1099,6 @@ int gk20a_user_init(struct device *dev, const char *interface_name, | |||
1099 | struct class *class); | 1099 | struct class *class); |
1100 | void gk20a_user_deinit(struct device *dev, struct class *class); | 1100 | void gk20a_user_deinit(struct device *dev, struct class *class); |
1101 | 1101 | ||
1102 | void gk20a_debug_dump_device(void *dev); | ||
1103 | |||
1104 | static inline u32 ptimer_scalingfactor10x(u32 ptimer_src_freq) | 1102 | static inline u32 ptimer_scalingfactor10x(u32 ptimer_src_freq) |
1105 | { | 1103 | { |
1106 | return (u32)(((u64)(PTIMER_REF_FREQ_HZ * 10)) / ptimer_src_freq); | 1104 | return (u32)(((u64)(PTIMER_REF_FREQ_HZ * 10)) / ptimer_src_freq); |