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

Commit 9731129c authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Remove eviction debug spam 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 2d7ef395

drivers/gpu/drm/i915/i915_gem.c

+7 −33
Original line number Original line Diff line number Diff line
@@ -2078,27 +2078,14 @@ i915_gem_evict_everything(struct drm_device *dev) 
	int ret;

	int ret;

	bool lists_empty;

	bool lists_empty;





	DRM_INFO("GTT full, evicting everything: "

		 "%d objects [%d pinned], "

		 "%d object bytes [%d pinned], "

		 "%d/%d gtt bytes\n",

		 atomic_read(&dev->object_count),

		 atomic_read(&dev->pin_count),

		 atomic_read(&dev->object_memory),

		 atomic_read(&dev->pin_memory),

		 atomic_read(&dev->gtt_memory),

		 dev->gtt_total);



	spin_lock(&dev_priv->mm.active_list_lock);

	spin_lock(&dev_priv->mm.active_list_lock);

	lists_empty = (list_empty(&dev_priv->mm.inactive_list) &&

	lists_empty = (list_empty(&dev_priv->mm.inactive_list) &&

		       list_empty(&dev_priv->mm.flushing_list) &&

		       list_empty(&dev_priv->mm.flushing_list) &&

		       list_empty(&dev_priv->mm.active_list));

		       list_empty(&dev_priv->mm.active_list));

	spin_unlock(&dev_priv->mm.active_list_lock);

	spin_unlock(&dev_priv->mm.active_list_lock);





	if (lists_empty) {

	if (lists_empty)

		DRM_ERROR("GTT full, but lists empty!\n");

		return -ENOSPC;

		return -ENOSPC;

	}





	/* Flush everything (on to the inactive lists) and evict */

	/* Flush everything (on to the inactive lists) and evict */

	i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);

	i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);
@@ -2209,10 +2196,9 @@ i915_gem_evict_something(struct drm_device *dev, int min_size) 
		 * large enough to swap out for the new one, so just evict

		 * large enough to swap out for the new one, so just evict

		 * everything and start again. (This should be rare.)

		 * everything and start again. (This should be rare.)

		 */

		 */

		if (!list_empty (&dev_priv->mm.inactive_list)) {

		if (!list_empty (&dev_priv->mm.inactive_list))

			DRM_INFO("GTT full, evicting inactive buffers\n");

			return i915_gem_evict_from_inactive_list(dev);

			return i915_gem_evict_from_inactive_list(dev);

		} else

		else

			return i915_gem_evict_everything(dev);

			return i915_gem_evict_everything(dev);

	}

	}

}

}
@@ -2237,7 +2223,6 @@ i915_gem_object_get_pages(struct drm_gem_object *obj) 
	BUG_ON(obj_priv->pages != NULL);

	BUG_ON(obj_priv->pages != NULL);

	obj_priv->pages = drm_calloc_large(page_count, sizeof(struct page *));

	obj_priv->pages = drm_calloc_large(page_count, sizeof(struct page *));

	if (obj_priv->pages == NULL) {

	if (obj_priv->pages == NULL) {

		DRM_ERROR("Failed to allocate page list\n");

		obj_priv->pages_refcount--;

		obj_priv->pages_refcount--;

		return -ENOMEM;

		return -ENOMEM;

	}

	}
@@ -2605,11 +2590,9 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) 
		DRM_INFO("%s: GTT full, evicting something\n", __func__);

		DRM_INFO("%s: GTT full, evicting something\n", __func__);

#endif

#endif

		ret = i915_gem_evict_something(dev, obj->size);

		ret = i915_gem_evict_something(dev, obj->size);

		if (ret != 0) {

		if (ret)

			if (ret != -ERESTARTSYS)

				DRM_ERROR("Failed to evict a buffer %d\n", ret);

			return ret;

			return ret;

		}



		goto search_free;

		goto search_free;

	}

	}
@@ -2634,9 +2617,6 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) 
			/* first try to clear up some space from the GTT */

			/* first try to clear up some space from the GTT */

			ret = i915_gem_evict_something(dev, obj->size);

			ret = i915_gem_evict_something(dev, obj->size);

			if (ret) {

			if (ret) {

				if (ret != -ERESTARTSYS)

					DRM_ERROR("Failed to allocate space for backing pages %d\n", ret);



				/* now try to shrink everyone else */

				/* now try to shrink everyone else */

				if (! retry_alloc) {

				if (! retry_alloc) {

				    retry_alloc = true;

				    retry_alloc = true;
@@ -2666,11 +2646,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) 
		obj_priv->gtt_space = NULL;

		obj_priv->gtt_space = NULL;





		ret = i915_gem_evict_something(dev, obj->size);

		ret = i915_gem_evict_something(dev, obj->size);

		if (ret) {

		if (ret)

			if (ret != -ERESTARTSYS)

				DRM_ERROR("Failed to allocate space to bind AGP: %d\n", ret);

			return ret;

			return ret;

		}





		goto search_free;

		goto search_free;

	}

	}
@@ -3870,12 +3847,9 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) 
	i915_verify_inactive(dev, __FILE__, __LINE__);

	i915_verify_inactive(dev, __FILE__, __LINE__);

	if (obj_priv->gtt_space == NULL) {

	if (obj_priv->gtt_space == NULL) {

		ret = i915_gem_object_bind_to_gtt(obj, alignment);

		ret = i915_gem_object_bind_to_gtt(obj, alignment);

		if (ret != 0) {

		if (ret)

			if (ret != -EBUSY && ret != -ERESTARTSYS)

				DRM_ERROR("Failure to bind: %d\n", ret);

			return ret;

			return ret;

	}

	}

	}

	/*

	/*

	 * Pre-965 chips need a fence register set up in order to

	 * Pre-965 chips need a fence register set up in order to

	 * properly handle tiled surfaces.

	 * properly handle tiled surfaces.