Merge tag 'v3.16-rc4' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:17:56 +0000 (10:17 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:17:56 +0000 (10:17 +0200)
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>
1  2 
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_context.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sprite.c

Simple merge
Simple merge
Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge