diff options
| author | Jammy Zhou <Jammy.Zhou@amd.com> | 2015-05-12 23:17:19 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-03 21:03:35 -0400 |
| commit | 4b095304ea7f73c178cd906df37185c0b9ad9a60 (patch) | |
| tree | 7e1710f507e9896d75859d7dbd96de75fcd962ee /drivers/gpu | |
| parent | 02b70c8c9f0351f5ddf70716b9049f3fe50d62e7 (diff) | |
| download | blackbird-op-linux-4b095304ea7f73c178cd906df37185c0b9ad9a60.tar.gz blackbird-op-linux-4b095304ea7f73c178cd906df37185c0b9ad9a60.zip | |
drm/amdgpu: do necessary NULL check
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index 855d56ac7115..21accbdd0a1a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -101,6 +101,9 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, unsigned i; int r = 0; + if (resv == NULL) + return -EINVAL; + /* always sync to the exclusive fence */ f = reservation_object_get_excl(resv); fence = f ? to_amdgpu_fence(f) : NULL; @@ -116,12 +119,12 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, for (i = 0; i < flist->shared_count; ++i) { f = rcu_dereference_protected(flist->shared[i], reservation_object_held(resv)); - fence = to_amdgpu_fence(f); + fence = f ? to_amdgpu_fence(f) : NULL; if (fence && fence->ring->adev == adev) { if (fence->owner != owner || fence->owner == AMDGPU_FENCE_OWNER_UNDEFINED) amdgpu_sync_fence(sync, fence); - } else { + } else if (f) { r = fence_wait(f, true); if (r) break; |
