Commit 87acb0a5 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Simplify most HAS_BSD() checks 



... by always initialising the empty ringbuffer it is always then safe
to check whether it is active.

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

drivers/gpu/drm/i915/i915_dma.c

+5 −5
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ static int i915_dma_cleanup(struct drm_device * dev) 


	mutex_lock(&dev->struct_mutex);

	intel_cleanup_ring_buffer(dev, &dev_priv->render_ring);

	if (HAS_BSD(dev))

	intel_cleanup_ring_buffer(dev, &dev_priv->bsd_ring);

	mutex_unlock(&dev->struct_mutex);
@@ -1199,9 +1198,6 @@ static int i915_load_modeset_init(struct drm_device *dev, 
	/* Basic memrange allocator for stolen space (aka mm.vram) */

	drm_mm_init(&dev_priv->mm.vram, 0, prealloc_size);



	/* We're off and running w/KMS */

	dev_priv->mm.suspended = 0;



	/* Let GEM Manage from end of prealloc space to end of aperture.

	 *

	 * However, leave one page at the end still bound to the scratch page.
@@ -1271,6 +1267,10 @@ static int i915_load_modeset_init(struct drm_device *dev, 
		goto cleanup_irq;



	drm_kms_helper_poll_init(dev);



	/* We're off and running w/KMS */

	dev_priv->mm.suspended = 0;



	return 0;



cleanup_irq:

drivers/gpu/drm/i915/i915_gem.c

+15 −28
Original line number Diff line number Diff line
@@ -1795,7 +1795,6 @@ void i915_gem_reset(struct drm_device *dev) 
	int i;



	i915_gem_reset_ring_lists(dev_priv, &dev_priv->render_ring);

	if (HAS_BSD(dev))

	i915_gem_reset_ring_lists(dev_priv, &dev_priv->bsd_ring);



	/* Remove anything from the flushing lists. The GPU cache is likely
@@ -1918,7 +1917,6 @@ i915_gem_retire_requests(struct drm_device *dev) 
	}



	i915_gem_retire_requests_ring(dev, &dev_priv->render_ring);

	if (HAS_BSD(dev))

	i915_gem_retire_requests_ring(dev, &dev_priv->bsd_ring);

}
@@ -1942,8 +1940,7 @@ i915_gem_retire_work_handler(struct work_struct *work) 


	if (!dev_priv->mm.suspended &&

		(!list_empty(&dev_priv->render_ring.request_list) ||

			(HAS_BSD(dev) &&

			 !list_empty(&dev_priv->bsd_ring.request_list))))

		 !list_empty(&dev_priv->bsd_ring.request_list)))

		queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ);

	mutex_unlock(&dev->struct_mutex);

}
@@ -2181,8 +2178,7 @@ i915_gpu_idle(struct drm_device *dev) 


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

		       list_empty(&dev_priv->render_ring.active_list) &&

		       (!HAS_BSD(dev) ||

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

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

	if (lists_empty)

		return 0;
@@ -2191,11 +2187,9 @@ i915_gpu_idle(struct drm_device *dev) 
	if (ret)

		return ret;



	if (HAS_BSD(dev)) {

	ret = i915_ring_idle(dev, &dev_priv->bsd_ring);

	if (ret)

		return ret;

	}



	return 0;

}
@@ -4349,10 +4343,7 @@ i915_gem_idle(struct drm_device *dev) 


	mutex_lock(&dev->struct_mutex);



	if (dev_priv->mm.suspended ||

			(dev_priv->render_ring.gem_object == NULL) ||

			(HAS_BSD(dev) &&

			 dev_priv->bsd_ring.gem_object == NULL)) {

	if (dev_priv->mm.suspended) {

		mutex_unlock(&dev->struct_mutex);

		return 0;

	}
@@ -4491,7 +4482,6 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = dev->dev_private;



	intel_cleanup_ring_buffer(dev, &dev_priv->render_ring);

	if (HAS_BSD(dev))

	intel_cleanup_ring_buffer(dev, &dev_priv->bsd_ring);

	if (HAS_PIPE_CONTROL(dev))

		i915_gem_cleanup_pipe_control(dev);
@@ -4522,11 +4512,11 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, 
	}



	BUG_ON(!list_empty(&dev_priv->render_ring.active_list));

	BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.active_list));

	BUG_ON(!list_empty(&dev_priv->bsd_ring.active_list));

	BUG_ON(!list_empty(&dev_priv->mm.flushing_list));

	BUG_ON(!list_empty(&dev_priv->mm.inactive_list));

	BUG_ON(!list_empty(&dev_priv->render_ring.request_list));

	BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.request_list));

	BUG_ON(!list_empty(&dev_priv->bsd_ring.request_list));

	mutex_unlock(&dev->struct_mutex);



	ret = drm_irq_install(dev);
@@ -4582,10 +4572,8 @@ i915_gem_load(struct drm_device *dev) 
	INIT_LIST_HEAD(&dev_priv->mm.deferred_free_list);

	INIT_LIST_HEAD(&dev_priv->render_ring.active_list);

	INIT_LIST_HEAD(&dev_priv->render_ring.request_list);

	if (HAS_BSD(dev)) {

	INIT_LIST_HEAD(&dev_priv->bsd_ring.active_list);

	INIT_LIST_HEAD(&dev_priv->bsd_ring.request_list);

	}

	for (i = 0; i < 16; i++)

		INIT_LIST_HEAD(&dev_priv->fence_regs[i].lru_list);

	INIT_DELAYED_WORK(&dev_priv->mm.retire_work,
@@ -4848,9 +4836,8 @@ i915_gpu_is_active(struct drm_device *dev) 
	int lists_empty;



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

		      list_empty(&dev_priv->render_ring.active_list);

	if (HAS_BSD(dev))

		lists_empty &= list_empty(&dev_priv->bsd_ring.active_list);

		      list_empty(&dev_priv->render_ring.active_list) &&

		      list_empty(&dev_priv->bsd_ring.active_list);



	return !lists_empty;

}

drivers/gpu/drm/i915/i915_gem_evict.c

+2 −4
Original line number Diff line number Diff line
@@ -215,8 +215,7 @@ i915_gem_evict_everything(struct drm_device *dev) 
	lists_empty = (list_empty(&dev_priv->mm.inactive_list) &&

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

		       list_empty(&dev_priv->render_ring.active_list) &&

		       (!HAS_BSD(dev)

			|| list_empty(&dev_priv->bsd_ring.active_list)));

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

	if (lists_empty)

		return -ENOSPC;
@@ -234,8 +233,7 @@ i915_gem_evict_everything(struct drm_device *dev) 
	lists_empty = (list_empty(&dev_priv->mm.inactive_list) &&

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

		       list_empty(&dev_priv->render_ring.active_list) &&

		       (!HAS_BSD(dev)

			|| list_empty(&dev_priv->bsd_ring.active_list)));

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

	BUG_ON(!lists_empty);



	return 0;