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.
--- drivers/gpu/drm/i915/i915_gem.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +11 -30
@@ -3470,46 +3470,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, obj_size, fence_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; + obj_size =i915_ggtt_view_size (obj, ggtt_view); }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; + obj_size = obj->base.size; } + fence_size =i915_gem_get_gtt_size (dev, obj_size, obj->tiling_mode); + fence_alignment =i915_gem_get_gtt_alignment (dev, obj_size, + obj->tiling_mode, true); + unfenced_alignment =i915_gem_get_gtt_alignment (dev, obj_size, + obj->tiling_mode, + false); + size = flags &PIN_MAPPABLE ? fence_size : obj_size; + start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; end = vm->total;if (flags &PIN_MAPPABLE )
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 47 lines · Matthew Auld
No functional change, just makes the code easier to follow.
Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_gem.c +2
-22@@ -3470,46 +3470,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, obj_size, fence_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; + obj_size =i915_ggtt_view_size (obj, ggtt_view); }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,
drivers/gpu/drm/i915/i915_gem.c i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, · line 3484
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +1
-8- 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; + obj_size = obj->base.size; }
PIN_MAPPABLE mandates PIN_GLOBAL, and PIN_GLOBAL mandates GGTT (see i915_gem_object_do_pin), so I think the cleanup should be just not to do any of the fence business on if !ggtt branch.
if (i915_is_ggtt(vm)) {
... existing code ...
} else {
size = obj->base.size;
}Check for NULL ggtt_view is also done on the higher level so perhaps that can go as well to consolidate the checks at one place.
drivers/gpu/drm/i915/i915_gem.c i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
Quoted 12 lines
drivers/gpu/drm/i915/i915_gem.c +8
-0+ fence_size =i915_gem_get_gtt_size (dev, obj_size, obj->tiling_mode); + fence_alignment =i915_gem_get_gtt_alignment (dev, obj_size, + obj->tiling_mode, true); + unfenced_alignment =i915_gem_get_gtt_alignment (dev, obj_size, + obj->tiling_mode, + false); + size = flags &PIN_MAPPABLE ? fence_size : obj_size; + start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; end = vm->total;if (flags &PIN_MAPPABLE )
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
If we don't do any of the fence business for !i915_is_gtt, then will this not change the following code:
if (alignment == 0)
alignment = flags & PIN_MAPPABLE ? fence_alignment : unfenced_alignment;
Or am I missing something?
Regards,
Matt
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Matthew Auld
Hi,
If we don't do any of the fence business for !i915_is_gtt, then will this not change the following code:
if (alignment == 0)
alignment = flags & PIN_MAPPABLE ? fence_alignment : unfenced_alignment;Or am I missing something?
Fwiw, the patches I have sent previously change it to:
size = max(size, vma->size);
if (flags & PIN_MAPPABLE)
size = i915_gem_get_gtt_size(dev, size, obj->tiling_mode);
alignment =
max_t(u64, max(alignment, vma->display_alignment),
i915_gem_get_gtt_alignment(dev, size, obj->tiling_mode, flags & PIN_MAPPABLE));
if (alignment == 4096)
alignment = 0;start = flags & PIN_OFFSET_BIAS ? flags & PIN_OFFSET_MASK : 0;
end = vma->vm->total;
if (flags & PIN_MAPPABLE)
end = min_t(u64, end, dev_priv->gtt.mappable_end); if (flags & PIN_ZONE_4G) end = min_t(u64, end, (1ULL << 32) - PAGE_SIZE);
-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
Quoted 9 lines · Matthew Auld
Hi,
If we don't do any of the fence business for !i915_is_gtt, then will this not change the following code:
if (alignment == 0)
alignment = flags & PIN_MAPPABLE ? fence_alignment : unfenced_alignment;Or am I missing something?
No I missed that bit. In which case your cleanup looks OK to me in principle. I would just not use obj_size since it is not that. Perhaps just reuse the existing size variable to hold the intermediate result?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: simplify bind_to_vm init code
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: simplify bind_to_vm init code
URL : https://patchwork.freedesktop.org/series/4531/
State : failure
== Summary ==
Series 4531v1 drm/i915: simplify bind_to_vm init code
http://patchwork.freedesktop.org/api/1.0/series/4531/revisions/1/mbox/
Test drv_module_reload_basic:
dmesg-warn -> PASS (hsw-gt2)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (hsw-gt2)
dmesg-warn -> PASS (bdw-ultra)
Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (hsw-brixbox)
Subgroup basic-plain-flip:
dmesg-warn -> PASS (hsw-brixbox)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-c-frame-sequence:
dmesg-warn -> PASS (hsw-gt2)
pass -> DMESG-WARN (hsw-brixbox)
Test pm_rpm:
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)
dmesg-warn -> PASS (hsw-brixbox)bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:173 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:194 pass:155 dwarn:2 dfail:0 fail:0 skip:37 byt-nuc total:194 pass:155 dwarn:4 dfail:0 fail:0 skip:35 hsw-brixbox total:194 pass:170 dwarn:2 dfail:0 fail:0 skip:22 hsw-gt2 total:194 pass:176 dwarn:1 dfail:0 fail:0 skip:17 ivb-t430s total:194 pass:169 dwarn:0 dfail:0 fail:0 skip:25 skl-i5k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-i7k-2 total:194 pass:171 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:194 pass:183 dwarn:0 dfail:0 fail:0 skip:11
Results at /archive/results/CI_IGT_test/Patchwork_1623/
8a9a911d489fe160df173580277983dac5952ed0 drm-intel-nightly: 2016y-03m-17d-10h-02m-10s UTC integration manifest 11854942755899b97e78942213f304b118a3a4ef drm/i915: simplify bind_to_vm init code
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx