diff options
| author |   Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2015-04-10 15:54:58 +0300 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-10 16:18:02 +0200 |
| commit | 1d335d1b62dd8475317d20e3f95072515243a810 (patch) | |
| tree | b4384640c204a02e0fde540d1e9574adc1072c98 /drivers/gpu/drm/i915/i915_gem_gtt.c | |
| parent | drm/i915/skl: Support for 90/270 rotation (diff) | |
| download | linux-dev-1d335d1b62dd8475317d20e3f95072515243a810.tar.xz linux-dev-1d335d1b62dd8475317d20e3f95072515243a810.zip | |
drm/i915: Move vm page allocation in proper place
Move to i915_vma_bind as it is part of the binding.
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 559cecaccf7f..0b679143772a 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2927,8 +2927,22 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma) int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, u32 flags) { + int ret; + + if (vma->vm->allocate_va_range) { + trace_i915_va_alloc(vma->vm, vma->node.start, + vma->node.size, + VM_TO_TRACE_NAME(vma->vm)); + + ret = vma->vm->allocate_va_range(vma->vm, + vma->node.start, + vma->node.size); + if (ret) + return ret; + } + if (i915_is_ggtt(vma->vm)) { - int ret = i915_get_ggtt_vma_pages(vma); + ret = i915_get_ggtt_vma_pages(vma); if (ret) return ret; |