From: Dave Airlie <airlied@redhat.com>
Date: Wed, 9 Jul 2014 00:38:42 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: v3.17-rc1~82^2~63
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a;p=~emulex%2Finfiniband.git

Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next

- Accurate frontbuffer tracking and frontbuffer rendering invalidate, flush and
  flip events. This is prep work for proper PSR support and should also be
  useful for DRRS&fbc.
- Runtime suspend hardware on system suspend to support the new SOix sleep
  states, from Jesse.
- PSR updates for broadwell (Rodrigo)
- Universal plane support for cursors (Matt Roper), including core drm patches.
- Prefault gtt mappings (Chris)
- baytrail write-enable pte bit support (Akash Goel)
- mmio based flips (Sourab Gupta) instead of blitter ring flips
- interrupt handling race fixes (Oscar Mateo)

And old, not yet merged features from the previous round:
- rps/turbo support for chv (Deepak)
- some other straggling chv patches (Ville)
- proper universal plane conversion for the primary plane (Matt Roper)
- ppgtt on vlv from Jesse
- pile of cleanups, little fixes for insane corner cases and improved debug
  support all over

* tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel: (99 commits)
  drm/i915: Update DRIVER_DATE to 20140620
  drivers/i915: Fix unnoticed failure of init_ring_common()
  drm/i915: Track frontbuffer invalidation/flushing
  drm/i915: Use new frontbuffer bits to increase pll clock
  drm/i915: don't take runtime PM reference around freeze/thaw
  drm/i915: use runtime irq suspend/resume in freeze/thaw
  drm/i915: Properly track domain of the fbcon fb
  drm/i915: Print obj->frontbuffer_bits in debugfs output
  drm/i915: Introduce accurate frontbuffer tracking
  drm/i915: Drop schedule_back from psr_exit
  drm/i915: Ditch intel_edp_psr_update
  drm/i915: Drop unecessary complexity from psr_inactivate
  drm/i915: Remove ctx->last_ring
  drm/i915/chv: Ack interrupts before handling them (CHV)
  drm/i915/bdw: Ack interrupts before handling them (GEN8)
  drm/i915/vlv: Ack interrupts before handling them (VLV)
  drm/i915: Ack interrupts before handling them (GEN5 - GEN7)
  drm/i915: Don't BUG_ON in i915_gem_obj_offset
  drm/i915: Grab dev->struct_mutex in i915_gem_pageflip_info
  drm/i915: Add some L3 registers to the parser whitelist
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
---

ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
diff --cc drivers/gpu/drm/i915/i915_drv.c
index d935ab3718e,6eb45ac7a7d..b0955fffca9
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -526,9 -520,10 +520,9 @@@ static int i915_drm_freeze(struct drm_d
  			return error;
  		}
  
- 		drm_irq_uninstall(dev);
+ 		intel_runtime_pm_disable_interrupts(dev);
 -		dev_priv->enable_hotplug_processing = false;
  
- 		intel_disable_gt_powersave(dev);
+ 		intel_suspend_gt_powersave(dev);
  
  		/*
  		 * Disable CRTCs directly since we want to preserve sw state
diff --cc drivers/gpu/drm/i915/i915_gem_context.c
index a5ddf3bce9c,21eda88ff54..0d2c75bde96
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@@ -703,9 -699,8 +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);