diff options
| author | Chris Wilson | 2015-11-20 15:16:39 +0100 |
|---|---|---|
| committer | Jani Nikula | 2015-12-22 10:52:27 +0100 |
| commit | 62d622c1f8d34bde3e3b9fd06f15c35d4028a8ff (patch) | |
| tree | 528f5027a9bd0bd6eac6fda0c4181acfa16067e7 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: Drop the broken cursor base==0 special casing (diff) | |
| download | kernel-qcow2-linux-62d622c1f8d34bde3e3b9fd06f15c35d4028a8ff.tar.gz kernel-qcow2-linux-62d622c1f8d34bde3e3b9fd06f15c35d4028a8ff.tar.xz kernel-qcow2-linux-62d622c1f8d34bde3e3b9fd06f15c35d4028a8ff.zip | |
drm/i915: Set the map-and-fenceable flag for preallocated objects
As we mark the preallocated objects as bound, we should also flag them
correctly as being map-and-fenceable (if appropriate!) so that later
users do not get confused and try and rebind the pinned vma in order to
get a map-and-fenceable binding.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Goel, Akash" <akash.goel@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: drm-intel-fixes@lists.freedesktop.org
Link: http://patchwork.freedesktop.org/patch/msgid/1448029000-10616-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit d0710abbcd88b1ff17760e97d74a673e67b49ea1)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a01e51581c4c..037a650d6565 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2839,6 +2839,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, u32 flags); +void __i915_vma_set_map_and_fenceable(struct i915_vma *vma); int __must_check i915_vma_unbind(struct i915_vma *vma); /* * BEWARE: Do not use the function below unless you can _absolutely_ |