|
@@ -605,7 +605,7 @@ static int do_switch(struct intel_engine_cs *ring,
|
|
|
BUG_ON(!i915_gem_obj_is_pinned(from->obj));
|
|
BUG_ON(!i915_gem_obj_is_pinned(from->obj));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (from == to && from->last_ring == ring && !to->remap_slice)
|
|
|
|
|
|
|
+ if (from == to && !to->remap_slice)
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
/* Trying to pin first makes error handling easier. */
|
|
/* Trying to pin first makes error handling easier. */
|
|
@@ -699,7 +699,6 @@ static int do_switch(struct intel_engine_cs *ring,
|
|
|
done:
|
|
done:
|
|
|
i915_gem_context_reference(to);
|
|
i915_gem_context_reference(to);
|
|
|
ring->last_context = to;
|
|
ring->last_context = to;
|
|
|
- to->last_ring = ring;
|
|
|
|
|
|
|
|
|
|
if (ring->id == RCS && !to->is_initialized && from == NULL) {
|
|
if (ring->id == RCS && !to->is_initialized && from == NULL) {
|
|
|
ret = i915_gem_render_state_init(ring);
|
|
ret = i915_gem_render_state_init(ring);
|