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

Commit 5032d871 authored by Rafael Barbalho's avatar Rafael Barbalho Committed by Daniel Vetter
Browse files

drm/i915: Cleaning up the relocate entry function 



As the relocate entry function was getting a bit too big I've moved
the code that used to use either the cpu or the gtt to for the
relocation into two separate functions.

Signed-off-by: default avatarRafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1403c0d4

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+54 −34
Original line number Original line Diff line number Diff line
@@ -171,6 +171,56 @@ static inline int use_cpu_reloc(struct drm_i915_gem_object *obj) 
		obj->cache_level != I915_CACHE_NONE);

		obj->cache_level != I915_CACHE_NONE);

}

}





static int

relocate_entry_cpu(struct drm_i915_gem_object *obj,

		   struct drm_i915_gem_relocation_entry *reloc)

{

	uint32_t page_offset = offset_in_page(reloc->offset);

	char *vaddr;

	int ret = -EINVAL;



	ret = i915_gem_object_set_to_cpu_domain(obj, 1);

	if (ret)

		return ret;



	vaddr = kmap_atomic(i915_gem_object_get_page(obj,

				reloc->offset >> PAGE_SHIFT));

	*(uint32_t *)(vaddr + page_offset) = reloc->delta;

	kunmap_atomic(vaddr);



	return 0;

}



static int

relocate_entry_gtt(struct drm_i915_gem_object *obj,

		   struct drm_i915_gem_relocation_entry *reloc)

{

	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t __iomem *reloc_entry;

	void __iomem *reloc_page;

	int ret = -EINVAL;



	ret = i915_gem_object_set_to_gtt_domain(obj, true);

	if (ret)

		return ret;



	ret = i915_gem_object_put_fence(obj);

	if (ret)

		return ret;



	/* Map the page containing the relocation we're going to perform.  */

	reloc->offset += i915_gem_obj_ggtt_offset(obj);

	reloc_page = io_mapping_map_atomic_wc(dev_priv->gtt.mappable,

			reloc->offset & PAGE_MASK);

	reloc_entry = (uint32_t __iomem *)

		(reloc_page + offset_in_page(reloc->offset));

	iowrite32(reloc->delta, reloc_entry);

	io_mapping_unmap_atomic(reloc_page);



	return 0;

}



static int

static int

i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,

i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,

				   struct eb_objects *eb,

				   struct eb_objects *eb,
@@ -255,40 +305,10 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, 
		return -EFAULT;

		return -EFAULT;





	reloc->delta += target_offset;

	reloc->delta += target_offset;

	if (use_cpu_reloc(obj)) {

	if (use_cpu_reloc(obj))

		uint32_t page_offset = offset_in_page(reloc->offset);

		ret = relocate_entry_cpu(obj, reloc);

		char *vaddr;

	else



		ret = relocate_entry_gtt(obj, reloc);

		ret = i915_gem_object_set_to_cpu_domain(obj, 1);

		if (ret)

			return ret;



		vaddr = kmap_atomic(i915_gem_object_get_page(obj,

							     reloc->offset >> PAGE_SHIFT));

		*(uint32_t *)(vaddr + page_offset) = reloc->delta;

		kunmap_atomic(vaddr);

	} else {

		struct drm_i915_private *dev_priv = dev->dev_private;

		uint32_t __iomem *reloc_entry;

		void __iomem *reloc_page;



		ret = i915_gem_object_set_to_gtt_domain(obj, true);

		if (ret)

			return ret;



		ret = i915_gem_object_put_fence(obj);

		if (ret)

			return ret;



		/* Map the page containing the relocation we're going to perform.  */

		reloc->offset += i915_gem_obj_ggtt_offset(obj);

		reloc_page = io_mapping_map_atomic_wc(dev_priv->gtt.mappable,

						      reloc->offset & PAGE_MASK);

		reloc_entry = (uint32_t __iomem *)

			(reloc_page + offset_in_page(reloc->offset));

		iowrite32(reloc->delta, reloc_entry);

		io_mapping_unmap_atomic(reloc_page);

	}





	/* and update the user's relocation entry */

	/* and update the user's relocation entry */

	reloc->presumed_offset = target_offset;

	reloc->presumed_offset = target_offset;