diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-11-17 17:20:22 +0300 |
|---|---|---|
| committer | Matthew Auld <matthew.auld@intel.com> | 2021-11-19 20:38:03 +0300 |
| commit | e6e1a304d759580d2dc0736d439b56e9866cf598 (patch) | |
| tree | 9296a79c5d02fe9568fbcca84cb683562d49ac54 /drivers/gpu/drm/i915/gt/intel_context.c | |
| parent | d03a29e0b1e10820631a9ba600ff669161001a84 (diff) | |
| download | linux-e6e1a304d759580d2dc0736d439b56e9866cf598.tar.xz | |
drm/i915: vma is always backed by an object.
vma->obj and vma->resv are now never NULL, and some checks can be removed.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211117142024.1043017-4-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index eb6a2c3975ba..538a4adb3cb7 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -219,7 +219,7 @@ int __intel_context_do_pin_ww(struct intel_context *ce, */ err = i915_gem_object_lock(ce->timeline->hwsp_ggtt->obj, ww); - if (!err && ce->ring->vma->obj) + if (!err) err = i915_gem_object_lock(ce->ring->vma->obj, ww); if (!err && ce->state) err = i915_gem_object_lock(ce->state->obj, ww); |