diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-06-27 02:46:33 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:20 -0400 |
commit | 2c15c3265bbcd88baf119f33f16c5a54d3d3f5a7 (patch) | |
tree | a6c2e8490e8ea13111a957f8f7e5b89108d5f721 /drivers/gpu | |
parent | 7833606cc22354c3145094d200099c475b8591e5 (diff) |
gpu: nvgpu: Bump unmap retries if not silicon
In simulation and emulation 50ms is not enough to ensure a job is
complete. Bump it to 5s when not running on silicon.
Bug 1510751
Change-Id: I90883b70ce2a75a8f07344f713d647b3fa0d0c7d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/432044
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chris Dragan <kdragan@nvidia.com>
Tested-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 6f62e1cb..e580732a 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -794,7 +794,10 @@ static void gk20a_vm_unmap_user(struct vm_gk20a *vm, u64 offset) | |||
794 | if (mapped_buffer->flags & NVHOST_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET) { | 794 | if (mapped_buffer->flags & NVHOST_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET) { |
795 | mutex_unlock(&vm->update_gmmu_lock); | 795 | mutex_unlock(&vm->update_gmmu_lock); |
796 | 796 | ||
797 | retries = 1000; | 797 | if (tegra_platform_is_silicon()) |
798 | retries = 1000; | ||
799 | else | ||
800 | retries = 1000000; | ||
798 | while (retries) { | 801 | while (retries) { |
799 | if (atomic_read(&mapped_buffer->ref.refcount) == 1) | 802 | if (atomic_read(&mapped_buffer->ref.refcount) == 1) |
800 | break; | 803 | break; |