drm/i915: simplify bind_to_vm init code
Subsystems (2)
PATCH 1/1 drm/i915: simplify bind_to_vm init code
No functional change, just makes the code easier to follow.
v2:
- Remove local fence_size variable
(Tvrtko Ursulin)
- Remove redundant NULL ggtt_view check
- Reuse size variable
--- drivers/gpu/drm/i915/i915_gem.c | 51 +++++++++++------------------------------ 1 file changed, 14 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +14 -37
@@ -3468,50 +3468,27 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,u32 fence_alignment, unfenced_alignment;u32 search_flag, alloc_flag;u64 start, end; -u64 size, fence_size; +u64 size;struct i915_vma *vma;int ret; -if (i915_is_ggtt (vm)) { -u32 view_size; - -if (WARN_ON (!ggtt_view)) -return ERR_PTR (-EINVAL ); - - view_size =i915_ggtt_view_size (obj, ggtt_view); - - fence_size =i915_gem_get_gtt_size (dev, - view_size, - obj->tiling_mode); - fence_alignment =i915_gem_get_gtt_alignment (dev, - view_size, - obj->tiling_mode, - true); - unfenced_alignment =i915_gem_get_gtt_alignment (dev, - view_size, - obj->tiling_mode, - false); - size = flags &PIN_MAPPABLE ? fence_size : view_size; - }else { - fence_size =i915_gem_get_gtt_size (dev, - obj->base.size, - obj->tiling_mode); - fence_alignment =i915_gem_get_gtt_alignment (dev, - obj->base.size, - obj->tiling_mode, - true); - unfenced_alignment = -i915_gem_get_gtt_alignment (dev, - obj->base.size, - obj->tiling_mode, - false); - size = flags &PIN_MAPPABLE ? fence_size : obj->base.size; - } +if (i915_is_ggtt (vm)) + size =i915_ggtt_view_size (obj, ggtt_view); +else + size = obj->base.size; + + fence_alignment =i915_gem_get_gtt_alignment (dev, size, + obj->tiling_mode, true); + unfenced_alignment =i915_gem_get_gtt_alignment (dev, size, + obj->tiling_mode, + false); start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; end = vm->total; -if (flags &PIN_MAPPABLE ) +if (flags &PIN_MAPPABLE ) { end =min_t (u64, end, dev_priv->gtt.mappable_end); + size =i915_gem_get_gtt_size (dev, size, obj->tiling_mode); + }if (flags &PIN_ZONE_4G ) end =min_t (u64, end, (1ULL <<32 ) -PAGE_SIZE );
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 73 lines · Matthew Auld
No functional change, just makes the code easier to follow.
v2:
- Remove localfence_sizevariable
(Tvrtko Ursulin)
- Remove redundant NULLggtt_viewcheck
- Reuse size variableSigned-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 51 +++++++++++------------------------------ 1 file changed, 14 insertions(+), 37 deletions(-)drivers/gpu/drm/i915/i915_gem.c +11
-36@@ -3468,50 +3468,27 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,u32 fence_alignment, unfenced_alignment;u32 search_flag, alloc_flag;u64 start, end; -u64 size, fence_size; +u64 size;struct i915_vma *vma;int ret; -if (i915_is_ggtt (vm)) { -u32 view_size; - -if (WARN_ON (!ggtt_view)) -return ERR_PTR (-EINVAL ); - - view_size =i915_ggtt_view_size (obj, ggtt_view); - - fence_size =i915_gem_get_gtt_size (dev, - view_size, - obj->tiling_mode); - fence_alignment =i915_gem_get_gtt_alignment (dev, - view_size, - obj->tiling_mode, - true); - unfenced_alignment =i915_gem_get_gtt_alignment (dev, - view_size, - obj->tiling_mode, - false); - size = flags &PIN_MAPPABLE ? fence_size : view_size; - }else { - fence_size =i915_gem_get_gtt_size (dev, - obj->base.size, - obj->tiling_mode); - fence_alignment =i915_gem_get_gtt_alignment (dev, - obj->base.size, - obj->tiling_mode, - true); - unfenced_alignment = -i915_gem_get_gtt_alignment (dev, - obj->base.size, - obj->tiling_mode, - false); - size = flags &PIN_MAPPABLE ? fence_size : obj->base.size; - } +if (i915_is_ggtt (vm)) + size =i915_ggtt_view_size (obj, ggtt_view); +else + size = obj->base.size; + + fence_alignment =i915_gem_get_gtt_alignment (dev, size, + obj->tiling_mode, true); + unfenced_alignment =i915_gem_get_gtt_alignment (dev, size, + obj->tiling_mode, + false);
drivers/gpu/drm/i915/i915_gem.c i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, · line 3494
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +3
-1start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; end = vm->total; -if (flags &PIN_MAPPABLE ) +if (flags &PIN_MAPPABLE ) { end =min_t (u64, end, dev_priv->gtt.mappable_end); + size =i915_gem_get_gtt_size (dev, size, obj->tiling_mode); + }if (flags &PIN_ZONE_4G ) end =min_t (u64, end, (1ULL <<32 ) -PAGE_SIZE );
Looks good to me.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 75 lines · Tvrtko Ursulin
Quoted 72 lines · Matthew Auld
No functional change, just makes the code easier to follow.
v2:
- Remove localfence_sizevariable
(Tvrtko Ursulin)
- Remove redundant NULLggtt_viewcheck
- Reuse size variableSigned-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 51 +++++++++++------------------------------ 1 file changed, 14 insertions(+), 37 deletions(-)drivers/gpu/drm/i915/i915_gem.c +11
-36@@ -3468,50 +3468,27 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,u32 fence_alignment, unfenced_alignment;u32 search_flag, alloc_flag;u64 start, end; -u64 size, fence_size; +u64 size;struct i915_vma *vma;int ret; -if (i915_is_ggtt (vm)) { -u32 view_size; - -if (WARN_ON (!ggtt_view)) -return ERR_PTR (-EINVAL ); - - view_size =i915_ggtt_view_size (obj, ggtt_view); - - fence_size =i915_gem_get_gtt_size (dev, - view_size, - obj->tiling_mode); - fence_alignment =i915_gem_get_gtt_alignment (dev, - view_size, - obj->tiling_mode, - true); - unfenced_alignment =i915_gem_get_gtt_alignment (dev, - view_size, - obj->tiling_mode, - false); - size = flags &PIN_MAPPABLE ? fence_size : view_size; - }else { - fence_size =i915_gem_get_gtt_size (dev, - obj->base.size, - obj->tiling_mode); - fence_alignment =i915_gem_get_gtt_alignment (dev, - obj->base.size, - obj->tiling_mode, - true); - unfenced_alignment = -i915_gem_get_gtt_alignment (dev, - obj->base.size, - obj->tiling_mode, - false); - size = flags &PIN_MAPPABLE ? fence_size : obj->base.size; - } +if (i915_is_ggtt (vm)) + size =i915_ggtt_view_size (obj, ggtt_view); +else + size = obj->base.size; + + fence_alignment =i915_gem_get_gtt_alignment (dev, size, + obj->tiling_mode, true); + unfenced_alignment =i915_gem_get_gtt_alignment (dev, size, + obj->tiling_mode, + false);
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, · line 3490
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c +2
-1start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; end = vm->total; -if (flags &PIN_MAPPABLE ) +if (flags &PIN_MAPPABLE ) { end =min_t (u64, end, dev_priv->gtt.mappable_end); + size =i915_gem_get_gtt_size (dev, size, obj->tiling_mode);
No. Keep the start, end computation separate.
For example the above size needs only be done when inspecting the i915_is_ggtt().
If you simplified the alignement as well, it becomes clearer. If you reviewed the patches to handle vma, it would help. The key question is what igt did you run to verify the changes?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx