diff options
| author | Tvrtko Ursulin | 2014-10-24 13:42:33 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-04 14:04:51 +0100 |
| commit | aff437667b93c3d65576b02628885687c72e1b3b (patch) | |
| tree | 56c324716e3a20f6c2f9357bd92bf6367cedea74 /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | Merge tag 'drm-intel-next-2014-10-24' of git://anongit.freedesktop.org/drm-in... (diff) | |
| download | kernel-qcow2-linux-aff437667b93c3d65576b02628885687c72e1b3b.tar.gz kernel-qcow2-linux-aff437667b93c3d65576b02628885687c72e1b3b.tar.xz kernel-qcow2-linux-aff437667b93c3d65576b02628885687c72e1b3b.zip | |
drm/i915: Move flags describing VMA mappings into the VMA
If these flags are on the object level it will be more difficult to allow
for multiple VMAs per object.
v2: Simplification and cleanup after code review comments (Chris Wilson).
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 85fda6b803e4..c38891892547 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -533,7 +533,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, } } - obj->has_global_gtt_mapping = 1; + vma->bound |= GLOBAL_BIND; list_add_tail(&obj->global_list, &dev_priv->mm.bound_list); list_add_tail(&vma->mm_list, &ggtt->inactive_list); |