diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2015-11-12 11:59:55 +0000 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-11-12 16:16:40 +0200 |
| commit | 1b683729e7ac3b003a03a1fd0803fd0fd3eb448d (patch) | |
| tree | 1af88a5d3fdf318b349710b0a840b747abcc1ec5 /drivers | |
| parent | af9b9c193184233d470bd71a0edc245feea34da4 (diff) | |
| download | linux-1b683729e7ac3b003a03a1fd0803fd0fd3eb448d.tar.bz2 | |
drm/i915: Remove redundant check in i915_gem_obj_to_vma
No need to verify VMA belongs to GGTT since:
1. The function must return a normal VMA belonging to passed in VM.
2. There can only be one normal VMA for any VM.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447329595-17495-1-git-send-email-tvrtko.ursulin@linux.intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f1e3fdeea41f..e955499a8ef1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4484,10 +4484,8 @@ struct i915_vma *i915_gem_obj_to_vma(struct drm_i915_gem_object *obj, { struct i915_vma *vma; list_for_each_entry(vma, &obj->vma_list, vma_link) { - if (i915_is_ggtt(vma->vm) && - vma->ggtt_view.type != I915_GGTT_VIEW_NORMAL) - continue; - if (vma->vm == vm) + if (vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL && + vma->vm == vm) return vma; } return NULL; |