Commit 4df2faf4 authored by Simona Vetter's avatar Simona Vetter Committed by Eric Anholt
Browse files

drm/i915: reuse i915_gpu_idle helper 



We have it, so use it. This required moving the function to avoid
a forward declaration.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 63560396

drivers/gpu/drm/i915/i915_gem.c

+25 −31
Original line number Diff line number Diff line
@@ -2094,12 +2094,35 @@ i915_gem_find_inactive_object(struct drm_device *dev, int min_size) 
	return best ? best : first;

}



static int

i915_gpu_idle(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	bool lists_empty;

	uint32_t seqno;



	spin_lock(&dev_priv->mm.active_list_lock);

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

		      list_empty(&dev_priv->mm.active_list);

	spin_unlock(&dev_priv->mm.active_list_lock);



	if (lists_empty)

		return 0;



	/* Flush everything onto the inactive list. */

	i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);

	seqno = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS);

	if (seqno == 0)

		return -ENOMEM;



	return i915_wait_request(dev, seqno);

}



static int

i915_gem_evict_everything(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	int ret;

	uint32_t seqno;

	bool lists_empty;



	spin_lock(&dev_priv->mm.active_list_lock);
@@ -2112,12 +2135,7 @@ i915_gem_evict_everything(struct drm_device *dev) 
		return -ENOSPC;



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

	i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);

	seqno = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS);

	if (seqno == 0)

		return -ENOMEM;



	ret = i915_wait_request(dev, seqno);

	ret = i915_gpu_idle(dev);

	if (ret)

		return ret;
@@ -4475,30 +4493,6 @@ i915_gem_evict_from_inactive_list(struct drm_device *dev) 
	return 0;

}



static int

i915_gpu_idle(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	bool lists_empty;

	uint32_t seqno;



	spin_lock(&dev_priv->mm.active_list_lock);

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

		      list_empty(&dev_priv->mm.active_list);

	spin_unlock(&dev_priv->mm.active_list_lock);



	if (lists_empty)

		return 0;



	/* Flush everything onto the inactive list. */

	i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);

	seqno = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS);

	if (seqno == 0)

		return -ENOMEM;



	return i915_wait_request(dev, seqno);

}



int

i915_gem_idle(struct drm_device *dev)

{