projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.16-rc4' into drm-intel-next-queued
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_context.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_context.c
b/drivers/gpu/drm/i915/i915_gem_context.c
index
a5ddf3b
..
0d2c75b
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_context.c
+++ b/
drivers/gpu/drm/i915/i915_gem_context.c
@@
-606,7
+606,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;
/* Trying to pin first makes error handling easier. */
return 0;
/* Trying to pin first makes error handling easier. */
@@
-703,7
+703,6
@@
static int do_switch(struct intel_engine_cs *ring,
done:
i915_gem_context_reference(to);
ring->last_context = to;
done:
i915_gem_context_reference(to);
ring->last_context = to;
- to->last_ring = ring;
if (uninitialized) {
ret = i915_gem_render_state_init(ring);
if (uninitialized) {
ret = i915_gem_render_state_init(ring);