diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2013-07-13 18:53:54 -0700 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2013-07-14 09:02:13 -0700 |
| commit | fb2dc6c8c6aa1d4f9a3880c9761352ccd9ea7d9f (patch) | |
| tree | 35f40fc75260e67d5b150dd3f0d3b16ea3af4ff6 | |
| parent | a2e885df4cb047dbf74dc90353f64cc459f2008c (diff) | |
drm/i915: Convert renderctx to a regular context
The medium term plan is to just use the existing context code on ILK as
well. The conversion just assists. Therefore, this is somewhat transient
as I plan to kill renderctx quite soon.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 18 |
4 files changed, 15 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 86379799dab8..5e88ef655dcb 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1347,9 +1347,9 @@ static int i915_context_status(struct seq_file *m, void *unused) seq_putc(m, '\n'); } - if (dev_priv->ips.renderctx) { + if (dev_priv->ips.renderctx.obj) { seq_puts(m, "render context "); - describe_obj(m, dev_priv->ips.renderctx); + describe_obj(m, dev_priv->ips.renderctx.obj); seq_putc(m, '\n'); } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 03ab05c903bc..64c6ae0145a4 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -789,7 +789,7 @@ struct intel_ilk_power_mgmt { int r_t; struct drm_i915_gem_object *pwrctx; - struct drm_i915_gem_object *renderctx; + struct i915_hw_context renderctx; }; /* Power well structure for haswell */ diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index ab72c7295fa3..2c25006ffc4d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -589,7 +589,7 @@ int ironlake_setup_rc6_hw_context(struct drm_i915_private *dev_priv) intel_ring_emit(ring, MI_SUSPEND_FLUSH | MI_SUSPEND_FLUSH_EN); intel_ring_emit(ring, MI_SET_CONTEXT); - intel_ring_emit(ring, i915_gem_obj_ggtt_offset(dev_priv->ips.renderctx) | + intel_ring_emit(ring, i915_gem_obj_ggtt_offset(dev_priv->ips.renderctx.obj) | MI_MM_SPACE_GTT | MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN | diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 2673602b70c9..10f8f7cd5ebc 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3615,10 +3615,10 @@ void ironlake_teardown_rc6(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - if (dev_priv->ips.renderctx) { - i915_gem_object_unpin(dev_priv->ips.renderctx); - drm_gem_object_unreference(&dev_priv->ips.renderctx->base); - dev_priv->ips.renderctx = NULL; + if (dev_priv->ips.renderctx.obj) { + i915_gem_object_unpin(dev_priv->ips.renderctx.obj); + drm_gem_object_unreference(&dev_priv->ips.renderctx.obj->base); + dev_priv->ips.renderctx.obj = NULL; } if (dev_priv->ips.pwrctx) { @@ -3650,10 +3650,14 @@ static int ironlake_setup_rc6(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - if (dev_priv->ips.renderctx == NULL) - dev_priv->ips.renderctx = intel_alloc_context_page(dev); - if (!dev_priv->ips.renderctx) + if (dev_priv->ips.renderctx.obj == NULL) + dev_priv->ips.renderctx.obj = intel_alloc_context_page(dev); + if (!dev_priv->ips.renderctx.obj) return -ENOMEM; + else { + dev_priv->ips.renderctx.id = DEFAULT_CONTEXT_ID; + dev_priv->ips.renderctx.ring = &dev_priv->ring[RCS]; + } if (dev_priv->ips.pwrctx == NULL) dev_priv->ips.pwrctx = intel_alloc_context_page(dev); |