From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 7 Jul 2014 08:17:56 +0000 (+0200)
Subject: Merge tag 'v3.16-rc4' into drm-intel-next-queued
X-Git-Tag: v6.6-pxa1908~22828^2~49^2~85
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f1615bbe9be4def59c3b3eaddb60722efeed16c2;p=linux.git

Merge tag 'v3.16-rc4' into drm-intel-next-queued

Due to Dave's vacation drm-next hasn't opened yet for 3.17 so I
couldn't move my drm-intel-next queue forward yet like I usually do.
Just pull in the latest upstream -rc to unblock patch merging - I
don't want to needlessly rebase my current patch pile really and void
all the testing we've done already.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

f1615bbe9be4def59c3b3eaddb60722efeed16c2
diff --cc drivers/gpu/drm/i915/i915_gem_context.c
index 21eda88ff541,a5ddf3bce9c3..0d2c75bde96e
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@@ -699,8 -703,9 +703,8 @@@ static int do_switch(struct intel_engin
  done:
  	i915_gem_context_reference(to);
  	ring->last_context = to;
 -	to->last_ring = ring;
  
- 	if (ring->id == RCS && !to->is_initialized && from == NULL) {
+ 	if (uninitialized) {
  		ret = i915_gem_render_state_init(ring);
  		if (ret)
  			DRM_ERROR("init render state: %d\n", ret);