diff options
| author |   Matthew Auld <matthew.auld@intel.com> | 2022-03-04 17:42:52 +0000 |
|---|---|---|
| committer | Matthew Auld <matthew.auld@intel.com> | 2022-03-07 09:57:21 +0000 |
| commit | e4b3ee71ec2a6378ce9d4f4a3160b00921241f48 (patch) | |
| tree | 60f4797cce1067df375d7836728dde8abd2d402b /drivers/gpu/drm/i915/i915_vma.c | |
| parent | drm/i915: limit the async bind to bind_async_flags (diff) | |
| download | linux-dev-e4b3ee71ec2a6378ce9d4f4a3160b00921241f48.tar.xz linux-dev-e4b3ee71ec2a6378ce9d4f4a3160b00921241f48.zip | |
drm/i915: stop checking for NULL vma->obj
This is no longer possible since e6e1a304d759 ("drm/i915: vma is always
backed by an object.").
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220304174252.1000238-1-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index a3fee872465d..34e2608211f5 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -525,21 +525,18 @@ int i915_vma_bind(struct i915_vma *vma, if (!work->vma_res->bi.pages_rsgt) work->pinned = i915_gem_object_get(vma->obj); } else { - if (vma->obj) { - ret = i915_gem_object_wait_moving_fence(vma->obj, true); - if (ret) { - i915_vma_resource_free(vma->resource); - vma->resource = NULL; + ret = i915_gem_object_wait_moving_fence(vma->obj, true); + if (ret) { + i915_vma_resource_free(vma->resource); + vma->resource = NULL; - return ret; - } + return ret; } vma->ops->bind_vma(vma->vm, NULL, vma->resource, cache_level, bind_flags); } - if (vma->obj) - set_bit(I915_BO_WAS_BOUND_BIT, &vma->obj->flags); + set_bit(I915_BO_WAS_BOUND_BIT, &vma->obj->flags); atomic_or(bind_flags, &vma->flags); return 0; @@ -1384,7 +1381,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, work->vm = vma->vm; - moving = vma->obj ? i915_gem_object_get_moving_fence(vma->obj) : NULL; + moving = i915_gem_object_get_moving_fence(vma->obj); dma_fence_work_chain(&work->base, moving); /* Allocate enough page directories to used PTE */ |