[09/12] drm/i915: Split context enabling from init

Commit Message

Ben Widawsky April 24, 2013, 6:15 a.m. UTC

Context init should have only been called once, ever. The code was
hackish because it predated some of the init cleanups. This patch
refactors the code to leave the part which must be run more than once
(reset, and thaw) as a distinct function.

I need this for some of my future plans to more closely tie a context to
a PPGTT.

Since context_init comes before ring_init now, we also have to add the
call to fini() if things go badly.

Signed-off-by: Ben Widawsky <[e-mail]>
---
 drivers/gpu/drm/i915/i915_drv.h         |  1 +
 drivers/gpu/drm/i915/i915_gem.c         | 18 +++++++++++++++---
 drivers/gpu/drm/i915/i915_gem_context.c | 18 +++++++++---------
 3 files changed, 25 insertions(+), 12 deletions(-)

Comments

Chris Wilson April 24, 2013, 10:04 a.m. UTC | #1

On Tue, Apr 23, 2013 at 11:15:37PM -0700, Ben Widawsky wrote:
> -	i915_gem_context_init(dev);
> +	if (!dev_priv->hw_contexts_disabled &&
> +	    i915_gem_context_enable(dev_priv)) {

Move the hw_contexts_disabled test into i915_gem_context_enable(), just
makes this bit of code cleaner and less incestrous.
-Chris

Ben Widawsky April 24, 2013, 4:39 p.m. UTC | #2

On Wed, Apr 24, 2013 at 11:04:40AM +0100, Chris Wilson wrote:
> On Tue, Apr 23, 2013 at 11:15:37PM -0700, Ben Widawsky wrote:
> > -	i915_gem_context_init(dev);
> > +	if (!dev_priv->hw_contexts_disabled &&
> > +	    i915_gem_context_enable(dev_priv)) {
> 
> Move the hw_contexts_disabled test into i915_gem_context_enable(), just
> makes this bit of code cleaner and less incestrous.
> -Chris

Got it locally, thanks for the idea. I'll wait a bit to resend in case
more review comes in.


> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 618845e..11cc159 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1699,6 +1699,7 @@  struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
 /* i915_gem_context.c */
 void i915_gem_context_init(struct drm_device *dev);
 void i915_gem_context_fini(struct drm_device *dev, bool reset);
+int i915_gem_context_enable(struct drm_i915_private *dev_priv);
 void i915_gem_context_close(struct drm_device *dev, struct drm_file *file);
 int i915_switch_context(struct intel_ring_buffer *ring,
 			struct drm_file *file, int to_id);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9c5eaf0..fbd289d 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2151,6 +2151,8 @@  void i915_gem_reset(struct drm_device *dev)
 	for_each_ring(ring, dev_priv, i)
 		i915_gem_reset_ring_lists(dev_priv, ring);
 
+	i915_gem_context_fini(dev, false);
+
 	/* Move everything out of the GPU domains to ensure we do any
 	 * necessary invalidation upon reuse.
 	 */
@@ -4029,10 +4031,18 @@  i915_gem_init_hw(struct drm_device *dev)
 		return ret;
 
 	/*
-	 * XXX: There was some w/a described somewhere suggesting loading
-	 * contexts before PPGTT.
+	 * XXX: Contexts should only be initialized once. Doing a switch to the
+	 * default context switch however is something we'd like to do after
+	 * reset or thaw (the latter may not actually be necessary for HW, but
+	 * goes with our code better).  Context switching requires rings (for
+	 * the do_switch), but before enabling PPGTT. So don't move this.
 	 */
-	i915_gem_context_init(dev);
+	if (!dev_priv->hw_contexts_disabled &&
+	    i915_gem_context_enable(dev_priv)) {
+		i915_gem_context_fini(dev, false);
+		dev_priv->hw_contexts_disabled = true;
+	}
+
 	if (dev_priv->mm.aliasing_ppgtt) {
 		ret = dev_priv->mm.aliasing_ppgtt->enable(dev);
 		if (ret) {
@@ -4060,6 +4070,8 @@  int i915_gem_init(struct drm_device *dev)
 
 	i915_gem_init_global_gtt(dev);
 
+	i915_gem_context_init(dev);
+
 	ret = i915_gem_init_hw(dev);
 	mutex_unlock(&dev->struct_mutex);
 	if (ret) {
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 6030d83..b2deddd 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -216,15 +216,10 @@  static int create_default_context(struct drm_i915_private *dev_priv)
 	if (ret)
 		goto err_destroy;
 
-	ret = do_switch(ctx);
-	if (ret)
-		goto err_unpin;
+	DRM_DEBUG_DRIVER("Default HW context created\n");
 
-	DRM_DEBUG_DRIVER("Default HW context loaded\n");
 	return 0;
 
-err_unpin:
-	i915_gem_object_unpin(ctx->obj);
 err_destroy:
 	do_destroy(ctx);
 	return ret;
@@ -239,9 +234,8 @@  void i915_gem_context_init(struct drm_device *dev)
 		return;
 	}
 
-	/* If called from reset, or thaw... we've been here already */
-	if (dev_priv->hw_contexts_disabled ||
-	    dev_priv->ring[RCS].default_context)
+	if (WARN_ON(dev_priv->hw_contexts_disabled ||
+	    dev_priv->ring[RCS].default_context))
 		return;
 
 	dev_priv->hw_context_size = round_up(get_context_size(dev), 4096);
@@ -279,6 +273,12 @@  void i915_gem_context_fini(struct drm_device *dev, bool reset)
 	dev_priv->ring[RCS].default_context = NULL;
 }
 
+int i915_gem_context_enable(struct drm_i915_private *dev_priv)
+{
+	BUG_ON(!dev_priv->ring[RCS].default_context);
+	return do_switch(dev_priv->ring[RCS].default_context);
+}
+
 static int context_idr_cleanup(int id, void *p, void *data)
 {
 	struct i915_hw_context *ctx = p;