There are two important reasons for this patch. It should make the
existing code a lot more readable. It also makes the next patch much
easier to understand in my opinion. There are 2 main variables that
effect this function, leaving 4 permutations:
ring: RCS vs !RCS
PPGTT: full or not
I didn't find extracting the full PPGTT usage to be very beneficial at
this point, but it may be in the future.
This was originally recommended by Daniel Vetter, and in this case, I
agree. There was no intentional behavioral change.
v2: Change the pin assertion to be GGTT only. This is more accurate.
Signed-off-by: Ben Widawsky <ben@xxxxxxxxxxxx>
---
drivers/gpu/drm/i915/i915_gem_context.c | 78 +++++++++++++++++++++------------
1 file changed, 50 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 0d2c75b..6dbe3e7 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -591,31 +591,57 @@ mi_set_context(struct intel_engine_cs *ring,
return ret;
}
-static int do_switch(struct intel_engine_cs *ring,
- struct intel_context *to)
+static void do_switch_fini_common(struct intel_engine_cs *ring,
+ struct intel_context *from,
+ struct intel_context *to)
+{
+ if (likely(from))
+ i915_gem_context_unreference(from);
+ i915_gem_context_reference(to);
+ ring->last_context = to;
+}
+
+static int do_switch_xcs(struct intel_engine_cs *ring,
+ struct intel_context *from,
+ struct intel_context *to)
+{
+ struct drm_device *dev = ring->dev;
+ struct i915_hw_ppgtt *ppgtt = ctx_to_ppgtt(to);
+ int ret;
+
+ BUG_ON(from && from->obj != NULL);
+
+ if (USES_FULL_PPGTT(dev)) {
+ ret = ppgtt->switch_mm(ppgtt, ring, false);
+ if (ret)
+ return ret;
+ }
+
+ if (from)
+ do_switch_fini_common(ring, from, to);
+
+ return 0;
+}
+
+static int do_switch_rcs(struct intel_engine_cs *ring,
+ struct intel_context *from,
+ struct intel_context *to)
{
struct drm_i915_private *dev_priv = ring->dev->dev_private;
- struct intel_context *from = ring->last_context;
struct i915_hw_ppgtt *ppgtt = ctx_to_ppgtt(to);
u32 hw_flags = 0;
bool uninitialized = false;
int ret, i;
- if (from != NULL && ring == &dev_priv->ring[RCS]) {
+ if (from != NULL) {
BUG_ON(from->obj == NULL);
- BUG_ON(!i915_gem_obj_is_pinned(from->obj));
+ BUG_ON(!i915_gem_obj_ggtt_bound(from->obj));
}
- if (from == to && !to->remap_slice)
- return 0;
-
/* Trying to pin first makes error handling easier. */
- if (ring == &dev_priv->ring[RCS]) {
- ret = i915_gem_obj_ggtt_pin(to->obj,
- get_context_alignment(ring->dev), 0);
- if (ret)
- return ret;
- }
+ ret = i915_gem_obj_ggtt_pin(to->obj, get_context_alignment(ring->dev), 0);
+ if (ret)
+ return ret;
/*
* Pin can switch back to the default context if we end up calling into
@@ -630,12 +656,6 @@ static int do_switch(struct intel_engine_cs *ring,
goto unpin_out;
}
- if (ring != &dev_priv->ring[RCS]) {
- if (from)
- i915_gem_context_unreference(from);
- goto done;
- }
-
/*
* Clear this page out of any CPU caches for coherent swap-in/out. Note
* that thanks to write = false in this call and us not setting any gpu
@@ -694,15 +714,11 @@ static int do_switch(struct intel_engine_cs *ring,
/* obj is kept alive until the next request by its active ref */
i915_gem_object_ggtt_unpin(from->obj);
- i915_gem_context_unreference(from);
}
uninitialized = !to->is_initialized && from == NULL;
to->is_initialized = true;
-
-done:
- i915_gem_context_reference(to);
- ring->last_context = to;
+ do_switch_fini_common(ring, from, to);
if (uninitialized) {
ret = i915_gem_render_state_init(ring);
@@ -713,8 +729,7 @@ done:
return 0;
unpin_out:
- if (ring->id == RCS)
- i915_gem_object_ggtt_unpin(to->obj);
+ i915_gem_object_ggtt_unpin(to->obj);
return ret;
}
@@ -732,6 +747,7 @@ int i915_switch_context(struct intel_engine_cs *ring,
struct intel_context *to)
{
struct drm_i915_private *dev_priv = ring->dev->dev_private;
+ struct intel_context *from = ring->last_context;
WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
@@ -745,7 +761,13 @@ int i915_switch_context(struct intel_engine_cs *ring,
return 0;
}
- return do_switch(ring, to);
+ if (from == to && !to->remap_slice)
+ return 0;
+
+ if (ring->id == RCS)
+ return do_switch_rcs(ring, from, to);
+ else
+ return do_switch_xcs(ring, from, to);
}
static bool hw_context_enabled(struct drm_device *dev)
--
2.0.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
