diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-13 10:23:46 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-14 14:46:04 +1000 |
| commit | 122d9c2bf7c70a969c0b66883ed1a14708866930 (patch) | |
| tree | 217872aa2a17155ee360f31dd15e394ec941a01f /drm/nouveau_gem.c | |
| parent | 4a52699ddfffb397cb7ea54e0569d4cad8eb52c4 (diff) | |
| download | nouveau-122d9c2bf7c70a969c0b66883ed1a14708866930.tar.gz | |
drm: allow nouveau_fence_ref() to be a noop
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau_gem.c')
| -rw-r--r-- | drm/nouveau_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drm/nouveau_gem.c b/drm/nouveau_gem.c index f32b71238..dfa80809a 100644 --- a/drm/nouveau_gem.c +++ b/drm/nouveau_gem.c @@ -115,8 +115,7 @@ nouveau_gem_object_unmap(struct nouveau_bo *nvbo, struct nouveau_vma *vma) if (mapped) { spin_lock(&nvbo->bo.bdev->fence_lock); - if (nvbo->bo.sync_obj) - fence = nouveau_fence_ref(nvbo->bo.sync_obj); + fence = nouveau_fence_ref(nvbo->bo.sync_obj); spin_unlock(&nvbo->bo.bdev->fence_lock); } @@ -446,8 +445,7 @@ validate_sync(struct nouveau_channel *chan, struct nouveau_bo *nvbo) int ret = 0; spin_lock(&nvbo->bo.bdev->fence_lock); - if (nvbo->bo.sync_obj) - fence = nouveau_fence_ref(nvbo->bo.sync_obj); + fence = nouveau_fence_ref(nvbo->bo.sync_obj); spin_unlock(&nvbo->bo.bdev->fence_lock); if (fence) { |