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

Commit 70b9f6f8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

rm/i915: Move i915_get_ggtt_vma_pages into ggtt_bind_vma 



We have this neat abstraction between ppgtt and ggtt for (un)bind_vma
and didn't end up using it really. What a shame, so fix this and make
the ->bind_vma hook a bit more useful.

Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 2c642b07

drivers/gpu/drm/i915/i915_gem_gtt.c

+24 −17
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ 
 *

 */



static int

i915_get_ggtt_vma_pages(struct i915_vma *vma);



const struct i915_ggtt_view i915_ggtt_view_normal;

const struct i915_ggtt_view i915_ggtt_view_rotated = {

        .type = I915_GGTT_VIEW_ROTATED
@@ -143,7 +146,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) 
		return has_aliasing_ppgtt ? 1 : 0;

}



static void ppgtt_bind_vma(struct i915_vma *vma,

static int ppgtt_bind_vma(struct i915_vma *vma,

			  enum i915_cache_level cache_level,

			  u32 unused)

{
@@ -155,6 +158,8 @@ static void ppgtt_bind_vma(struct i915_vma *vma, 


	vma->vm->insert_entries(vma->vm, vma->obj->pages, vma->node.start,

				cache_level, pte_flags);



	return 0;

}



static void ppgtt_unbind_vma(struct i915_vma *vma)
@@ -1898,7 +1903,7 @@ static void i915_ggtt_clear_range(struct i915_address_space *vm, 
	intel_gtt_clear_range(first_entry, num_entries);

}



static void ggtt_bind_vma(struct i915_vma *vma,

static int ggtt_bind_vma(struct i915_vma *vma,

			 enum i915_cache_level cache_level,

			 u32 flags)

{
@@ -1907,13 +1912,17 @@ static void ggtt_bind_vma(struct i915_vma *vma, 
	struct drm_i915_gem_object *obj = vma->obj;

	struct sg_table *pages = obj->pages;

	u32 pte_flags = 0;

	int ret;



	ret = i915_get_ggtt_vma_pages(vma);

	if (ret)

		return ret;

	pages = vma->ggtt_view.pages;



	/* Currently applicable only to VLV */

	if (obj->gt_ro)

		pte_flags |= PTE_READ_ONLY;



	if (i915_is_ggtt(vma->vm))

		pages = vma->ggtt_view.pages;



	if (!dev_priv->mm.aliasing_ppgtt || flags & GLOBAL_BIND) {

		vma->vm->insert_entries(vma->vm, pages,
@@ -1929,6 +1938,8 @@ static void ggtt_bind_vma(struct i915_vma *vma, 
					    vma->node.start,

					    cache_level, pte_flags);

	}



	return 0;

}



static void ggtt_unbind_vma(struct i915_vma *vma)
@@ -2749,7 +2760,7 @@ intel_rotate_fb_obj_pages(struct i915_ggtt_view *ggtt_view, 
	return ERR_PTR(ret);

}



static inline int

static int

i915_get_ggtt_vma_pages(struct i915_vma *vma)

{

	int ret = 0;
@@ -2793,8 +2804,8 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma) 
int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,

		  u32 flags)

{

	int ret = 0;

	u32 bind_flags = 0;

	int ret;



	if (vma->vm->allocate_va_range) {

		trace_i915_va_alloc(vma->vm, vma->node.start,
@@ -2808,12 +2819,6 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, 
			return ret;

	}



	if (i915_is_ggtt(vma->vm)) {

		ret = i915_get_ggtt_vma_pages(vma);

		if (ret)

			return 0;

	}



	if (flags & PIN_GLOBAL)

		bind_flags |= GLOBAL_BIND;

	if (flags & PIN_USER)
@@ -2825,7 +2830,9 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, 
		bind_flags &= ~vma->bound;



	if (bind_flags)

		vma->vm->bind_vma(vma, cache_level, bind_flags);

		ret = vma->vm->bind_vma(vma, cache_level, bind_flags);

	if (ret)

		return ret;



	vma->bound |= bind_flags;

drivers/gpu/drm/i915/i915_gem_gtt.h

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ struct i915_address_space { 
	 * setting the valid PTE entries to a reserved scratch page. */

	void (*unbind_vma)(struct i915_vma *vma);

	/* Map an object into an address space with the given cache flags. */

	void (*bind_vma)(struct i915_vma *vma,

	int (*bind_vma)(struct i915_vma *vma,

			enum i915_cache_level cache_level,

			u32 flags);

};