forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: cleanup map&fence in bind

Browse source 
Cleanup the map and fenceable setting during bind to make more sense,
and not check i915_is_ggtt() 2 unnecessary times

v2: Move the bools into the if block (Chris) - There are ways to tidy
this function (fence calculations for instance) even further, but they
are quite invasive, so I am punting on those unless specifically asked.

v3: Add newline between variable declaration and logic (Chris)

Recommended-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ben Widawsky 2013-08-13 18:09:07 -07:00 • committed by Daniel Vetter
parent 433544bd25
commit 4bd561b3e8
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpu/drm/i915/i915_gem.c
View file

@ -3119,7 +3119,6 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
struct drm_device *dev = obj->base.dev; struct drm_device *dev = obj->base.dev;
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
u32 size, fence_size, fence_alignment, unfenced_alignment; u32 size, fence_size, fence_alignment, unfenced_alignment;
bool mappable, fenceable;
size_t gtt_max = size_t gtt_max =
map_and_fenceable ? dev_priv->gtt.mappable_end : vm->total; map_and_fenceable ? dev_priv->gtt.mappable_end : vm->total;
struct i915_vma *vma; struct i915_vma *vma;
@ -3203,18 +3202,18 @@ search_free:
list_move_tail(&obj->global_list, &dev_priv->mm.bound_list); list_move_tail(&obj->global_list, &dev_priv->mm.bound_list);
list_add_tail(&vma->mm_list, &vm->inactive_list); list_add_tail(&vma->mm_list, &vm->inactive_list);
fenceable = if (i915_is_ggtt(vm)) {
i915_is_ggtt(vm) && bool mappable, fenceable;
i915_gem_obj_ggtt_size(obj) == fence_size &&
(i915_gem_obj_ggtt_offset(obj) & (fence_alignment - 1)) == 0;
mappable = fenceable =
i915_is_ggtt(vm) && i915_gem_obj_ggtt_size(obj) == fence_size &&
vma->node.start + obj->base.size <= dev_priv->gtt.mappable_end; (i915_gem_obj_ggtt_offset(obj) & (fence_alignment - 1)) == 0;
mappable =
vma->node.start + obj->base.size <= dev_priv->gtt.mappable_end;
/* Map and fenceable only changes if the VM is the global GGTT */
if (i915_is_ggtt(vm))
obj->map_and_fenceable = mappable && fenceable; obj->map_and_fenceable = mappable && fenceable;
}
WARN_ON(map_and_fenceable && !obj->map_and_fenceable); WARN_ON(map_and_fenceable && !obj->map_and_fenceable);