drm/i915/region: support volatile objects (7c98501a) · Commits · 戴 / test

drivers/gpu/drm/i915/gem/i915_gem_internal.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -117,13 +117,6 @@ create_st:
		goto err;
		}

		/* Mark the pages as dontneed whilst they are still pinned. As soon
		* as they are unpinned they are allowed to be reaped by the shrinker,
		* and the caller is expected to repopulate - the contents of this
		* object are only valid whilst active and pinned.
		*/
		obj->mm.madv = I915_MADV_DONTNEED;

		__i915_gem_object_set_pages(obj, st, sg_page_sizes);

		return 0;
		@@ -143,7 +136,6 @@ static void i915_gem_object_put_pages_internal(struct drm_i915_gem_object *obj,
		internal_free_pages(pages);

		obj->mm.dirty = false;
		obj->mm.madv = I915_MADV_WILLNEED;
		}

		static const struct drm_i915_gem_object_ops i915_gem_object_internal_ops = {
		@@ -188,6 +180,15 @@ i915_gem_object_create_internal(struct drm_i915_private *i915,
		drm_gem_private_object_init(&i915->drm, &obj->base, size);
		i915_gem_object_init(obj, &i915_gem_object_internal_ops);

		/*
		* Mark the object as volatile, such that the pages are marked as
		* dontneed whilst they are still pinned. As soon as they are unpinned
		* they are allowed to be reaped by the shrinker, and the caller is
		* expected to repopulate - the contents of this object are only valid
		* whilst active and pinned.
		*/
		i915_gem_object_set_volatile(obj);

		obj->read_domains = I915_GEM_DOMAIN_CPU;
		obj->write_domain = I915_GEM_DOMAIN_CPU;

+12 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,18 @@ i915_gem_object_is_contiguous(const struct drm_i915_gem_object *obj)
		return obj->flags & I915_BO_ALLOC_CONTIGUOUS;
		}

		static inline bool
		i915_gem_object_is_volatile(const struct drm_i915_gem_object *obj)
		{
		return obj->flags & I915_BO_ALLOC_VOLATILE;
		}

		static inline void
		i915_gem_object_set_volatile(struct drm_i915_gem_object *obj)
		{
		obj->flags \|= I915_BO_ALLOC_VOLATILE;
		}

		static inline bool
		i915_gem_object_type_has(const struct drm_i915_gem_object *obj,
		unsigned long flags)

+8 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,8 @@ struct drm_i915_gem_object {

		unsigned long flags;
		#define I915_BO_ALLOC_CONTIGUOUS BIT(0)
		#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS)
		#define I915_BO_ALLOC_VOLATILE BIT(1)
		#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS \| I915_BO_ALLOC_VOLATILE)

		/*
		* Is the object to be mapped as read-only to the GPU
		@@ -172,6 +173,12 @@ struct drm_i915_gem_object {
		* List of memory region blocks allocated for this object.
		*/
		struct list_head blocks;
		/**
		* Element within memory_region->objects or region->purgeable
		* if the object is marked as DONTNEED. Access is protected by
		* region->obj_lock.
		*/
		struct list_head region_link;

		struct sg_table *pages;
		void *mapping;

+6 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj,

		lockdep_assert_held(&obj->mm.lock);

		if (i915_gem_object_is_volatile(obj))
		obj->mm.madv = I915_MADV_DONTNEED;

		/* Make the pages coherent with the GPU (flushing any swapin). */
		if (obj->cache_dirty) {
		obj->write_domain = 0;
		@@ -160,6 +163,9 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
		if (IS_ERR_OR_NULL(pages))
		return pages;

		if (i915_gem_object_is_volatile(obj))
		obj->mm.madv = I915_MADV_WILLNEED;

		i915_gem_object_make_unshrinkable(obj);

		if (obj->mm.mapping) {

+16 −1

Original line number	Diff line number	Diff line
		@@ -107,11 +107,26 @@ void i915_gem_object_init_memory_region(struct drm_i915_gem_object *obj,
		INIT_LIST_HEAD(&obj->mm.blocks);
		obj->mm.region = intel_memory_region_get(mem);
		obj->flags \|= flags;

		mutex_lock(&mem->objects.lock);

		if (obj->flags & I915_BO_ALLOC_VOLATILE)
		list_add(&obj->mm.region_link, &mem->objects.purgeable);
		else
		list_add(&obj->mm.region_link, &mem->objects.list);

		mutex_unlock(&mem->objects.lock);
		}

		void i915_gem_object_release_memory_region(struct drm_i915_gem_object *obj)
		{
		intel_memory_region_put(obj->mm.region);
		struct intel_memory_region *mem = obj->mm.region;

		mutex_lock(&mem->objects.lock);
		list_del(&obj->mm.region_link);
		mutex_unlock(&mem->objects.lock);

		intel_memory_region_put(mem);
		}

		struct drm_i915_gem_object *