Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 596c5923 authored by Chris Wilson's avatar Chris Wilson Committed by Tvrtko Ursulin
Browse files

drm/i915: Reduce the pointer dance of i915_is_ggtt() 



The multiple levels of indirect do nothing but hinder the compiler and
the pointer chasing turns to be quite painful but painless to fix.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarDave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456484600-11477-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent 1c7f4bca

drivers/gpu/drm/i915/i915_debugfs.c

+6 −7
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static u64 i915_gem_obj_total_ggtt_size(struct drm_i915_gem_object *obj) 
	struct i915_vma *vma;



	list_for_each_entry(vma, &obj->vma_list, obj_link) {

		if (i915_is_ggtt(vma->vm) && drm_mm_node_allocated(&vma->node))

		if (vma->is_ggtt && drm_mm_node_allocated(&vma->node))

			size += vma->node.size;

	}
@@ -165,11 +165,10 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
		seq_printf(m, " (fence: %d)", obj->fence_reg);

	list_for_each_entry(vma, &obj->vma_list, obj_link) {

		seq_printf(m, " (%sgtt offset: %08llx, size: %08llx",

			   i915_is_ggtt(vma->vm) ? "g" : "pp",

			   vma->is_ggtt ? "g" : "pp",

			   vma->node.start, vma->node.size);

		if (i915_is_ggtt(vma->vm))

			seq_printf(m, ", type: %u)", vma->ggtt_view.type);

		else

		if (vma->is_ggtt)

			seq_printf(m, ", type: %u", vma->ggtt_view.type);

		seq_puts(m, ")");

	}

	if (obj->stolen)
@@ -347,7 +346,7 @@ static int per_file_stats(int id, void *ptr, void *data) 
			if (!drm_mm_node_allocated(&vma->node))

				continue;



			if (i915_is_ggtt(vma->vm)) {

			if (vma->is_ggtt) {

				stats->global += obj->base.size;

				continue;

			}

drivers/gpu/drm/i915/i915_drv.h

+0 −7
Original line number Diff line number Diff line
@@ -3156,18 +3156,11 @@ bool i915_gem_obj_is_pinned(struct drm_i915_gem_object *obj); 
/* Some GGTT VM helpers */

#define i915_obj_to_ggtt(obj) \

	(&((struct drm_i915_private *)(obj)->base.dev->dev_private)->gtt.base)

static inline bool i915_is_ggtt(struct i915_address_space *vm)

{

	struct i915_address_space *ggtt =

		&((struct drm_i915_private *)(vm)->dev->dev_private)->gtt.base;

	return vm == ggtt;

}



static inline struct i915_hw_ppgtt *

i915_vm_to_ppgtt(struct i915_address_space *vm)

{

	WARN_ON(i915_is_ggtt(vm));



	return container_of(vm, struct i915_hw_ppgtt, base);

}

drivers/gpu/drm/i915/i915_gem.c

+7 −11
Original line number Diff line number Diff line
@@ -3336,8 +3336,7 @@ static int __i915_vma_unbind(struct i915_vma *vma, bool wait) 
			return ret;

	}



	if (i915_is_ggtt(vma->vm) &&

	    vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL) {

	if (vma->is_ggtt && vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL) {

		i915_gem_object_finish_gtt(obj);



		/* release the fence reg _after_ flushing */
@@ -3352,7 +3351,7 @@ static int __i915_vma_unbind(struct i915_vma *vma, bool wait) 
	vma->bound = 0;



	list_del_init(&vma->vm_link);

	if (i915_is_ggtt(vma->vm)) {

	if (vma->is_ggtt) {

		if (vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL) {

			obj->map_and_fenceable = false;

		} else if (vma->ggtt_view.pages) {
@@ -4639,17 +4638,14 @@ struct i915_vma *i915_gem_obj_to_ggtt_view(struct drm_i915_gem_object *obj, 


void i915_gem_vma_destroy(struct i915_vma *vma)

{

	struct i915_address_space *vm = NULL;

	WARN_ON(vma->node.allocated);



	/* Keep the vma as a placeholder in the execbuffer reservation lists */

	if (!list_empty(&vma->exec_list))

		return;



	vm = vma->vm;



	if (!i915_is_ggtt(vm))

		i915_ppgtt_put(i915_vm_to_ppgtt(vm));

	if (!vma->is_ggtt)

		i915_ppgtt_put(i915_vm_to_ppgtt(vma->vm));



	list_del(&vma->obj_link);
@@ -5202,7 +5198,7 @@ u64 i915_gem_obj_offset(struct drm_i915_gem_object *o, 
	WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base);



	list_for_each_entry(vma, &o->vma_list, obj_link) {

		if (i915_is_ggtt(vma->vm) &&

		if (vma->is_ggtt &&

		    vma->ggtt_view.type != I915_GGTT_VIEW_NORMAL)

			continue;

		if (vma->vm == vm)
@@ -5235,7 +5231,7 @@ bool i915_gem_obj_bound(struct drm_i915_gem_object *o, 
	struct i915_vma *vma;



	list_for_each_entry(vma, &o->vma_list, obj_link) {

		if (i915_is_ggtt(vma->vm) &&

		if (vma->is_ggtt &&

		    vma->ggtt_view.type != I915_GGTT_VIEW_NORMAL)

			continue;

		if (vma->vm == vm && drm_mm_node_allocated(&vma->node))
@@ -5282,7 +5278,7 @@ unsigned long i915_gem_obj_size(struct drm_i915_gem_object *o, 
	BUG_ON(list_empty(&o->vma_list));



	list_for_each_entry(vma, &o->vma_list, obj_link) {

		if (i915_is_ggtt(vma->vm) &&

		if (vma->is_ggtt &&

		    vma->ggtt_view.type != I915_GGTT_VIEW_NORMAL)

			continue;

		if (vma->vm == vm)

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+2 −3
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ need_reloc_mappable(struct i915_vma *vma) 
	if (entry->relocation_count == 0)

		return false;



	if (!i915_is_ggtt(vma->vm))

	if (!vma->is_ggtt)

		return false;



	/* See also use_cpu_reloc() */
@@ -687,8 +687,7 @@ eb_vma_misplaced(struct i915_vma *vma) 
	struct drm_i915_gem_exec_object2 *entry = vma->exec_entry;

	struct drm_i915_gem_object *obj = vma->obj;



	WARN_ON(entry->flags & __EXEC_OBJECT_NEEDS_MAP &&

	       !i915_is_ggtt(vma->vm));

	WARN_ON(entry->flags & __EXEC_OBJECT_NEEDS_MAP && !vma->is_ggtt);



	if (entry->alignment &&

	    vma->node.start & (entry->alignment - 1))

drivers/gpu/drm/i915/i915_gem_gtt.c

+5 −7
Original line number Diff line number Diff line
@@ -3198,6 +3198,7 @@ int i915_gem_gtt_init(struct drm_device *dev) 
	}



	gtt->base.dev = dev;

	gtt->base.is_ggtt = true;



	ret = gtt->gtt_probe(dev, &gtt->base.total, &gtt->stolen_size,

			     &gtt->mappable_base, &gtt->mappable_end);
@@ -3319,13 +3320,14 @@ __i915_gem_vma_create(struct drm_i915_gem_object *obj, 
	INIT_LIST_HEAD(&vma->exec_list);

	vma->vm = vm;

	vma->obj = obj;

	vma->is_ggtt = i915_is_ggtt(vm);



	if (i915_is_ggtt(vm))

		vma->ggtt_view = *ggtt_view;

	else

		i915_ppgtt_get(i915_vm_to_ppgtt(vm));



	list_add_tail(&vma->obj_link, &obj->vma_list);

	if (!i915_is_ggtt(vm))

		i915_ppgtt_get(i915_vm_to_ppgtt(vm));



	return vma;

}
@@ -3598,13 +3600,9 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, 
		return 0;



	if (vma->bound == 0 && vma->vm->allocate_va_range) {

		trace_i915_va_alloc(vma->vm,

				    vma->node.start,

				    vma->node.size,

				    VM_TO_TRACE_NAME(vma->vm));



		/* XXX: i915_vma_pin() will fix this +- hack */

		vma->pin_count++;

		trace_i915_va_alloc(vma);

		ret = vma->vm->allocate_va_range(vma->vm,

						 vma->node.start,

						 vma->node.size);