drm/i915: Move vm page allocation in proper place
Subsystems (2)
PATCH 1/1 drm/i915: Move vm page allocation in proper place
Move to i915_vma_bind as it is part of the binding.
--- drivers/gpu/drm/i915/i915_gem.c | 11 ----------- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +0 -11
@@ -3550,17 +3550,6 @@ search_free:if (ret) goto err_remove_node; -/* allocate before insert / bind */ -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) - goto err_remove_node; - } -trace_i915_vma_bind (vma, flags); ret =i915_vma_bind (vma, obj->cache_level, flags &PIN_GLOBAL ?GLOBAL_BIND :0 );
drivers/gpu/drm/i915/i915_gem_gtt.c +15 -1
@@ -2936,8 +2936,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;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 5 lines · Mika Kuoppala
Move to
i915_vma_bindas it is part of the binding.Suggested-by Chris Wilson <[email protected]>Cc Michel Thierry <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 62 lines
--- drivers/gpu/drm/i915/i915_gem.c | 11 ----------- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/i915_gem.c +0
-11@@ -3550,17 +3550,6 @@ search_free:if (ret) goto err_remove_node; -/* allocate before insert / bind */ -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) - goto err_remove_node; - } -trace_i915_vma_bind (vma, flags); ret =i915_vma_bind (vma, obj->cache_level, flags &PIN_GLOBAL ?GLOBAL_BIND :0 );drivers/gpu/drm/i915/i915_gem_gtt.c +15
-1@@ -2936,8 +2936,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;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6174 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -3 276/276 273/276
ILK 301/301 301/301 SNB 316/316 316/316 IVB 328/328 328/328 BYT 285/285 285/285
HSW -1 394/394 393/394
BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
PNV igt@gen3_render_linear_blits FAIL(3)PASS(1) FAIL(2) PNV igt@gen3_render_tiledx_blits FAIL(3)PASS(1) FAIL(2) PNV igt@gen3_render_tiledy_blits FAIL(3)PASS(1) FAIL(2) *HSW igt@gem_partial_pwrite_pread@write-display PASS(2) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:i915_hangcheck_elapsed[i915]]*ERROR*Hangcheck_timer_elapsed...blitter_ring_idle@Hangcheck timer elapsed... blitter ring idle
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx