diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-03-22 12:25:05 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-23 20:16:57 -0400 |
commit | 90925a739ab80a93c6a325c12a61752c24339089 (patch) | |
tree | 75c2ae029a18beef5b15481c19c4f157214179c4 /drivers/gpu/nvgpu/common/mm/vm.c | |
parent | b5b4353ca6cc9b6457ddccc00bf87538291870fc (diff) |
gpu: nvgpu: check sema pool alloc failure properly
nvgpu_semaphore_pool_alloc() returns an ERR_PTR instead of NULL which
the caller checks on failure. Common code should not use ERR_PTRs
though, so modify nvgpu_semaphore_pool_alloc() to return error code
separately and fix nvgpu_init_sema_pool() to consider this.
Jira NVGPU-513
Change-Id: I435c0d2794d226774ed4c6b3bcbdde1e741854d8
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1673458
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/vm.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c index f57b1c9c..13fd641e 100644 --- a/drivers/gpu/nvgpu/common/mm/vm.c +++ b/drivers/gpu/nvgpu/common/mm/vm.c | |||
@@ -230,9 +230,9 @@ static int nvgpu_init_sema_pool(struct vm_gk20a *vm) | |||
230 | if (!sema_sea) | 230 | if (!sema_sea) |
231 | return -ENOMEM; | 231 | return -ENOMEM; |
232 | 232 | ||
233 | vm->sema_pool = nvgpu_semaphore_pool_alloc(sema_sea); | 233 | err = nvgpu_semaphore_pool_alloc(sema_sea, &vm->sema_pool); |
234 | if (!vm->sema_pool) | 234 | if (err) |
235 | return -ENOMEM; | 235 | return err; |
236 | 236 | ||
237 | /* | 237 | /* |
238 | * Allocate a chunk of GPU VA space for mapping the semaphores. We will | 238 | * Allocate a chunk of GPU VA space for mapping the semaphores. We will |