Merge remote-tracking branch 'airlied/drm-next' into HEAD

Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.

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

diff --cc drivers/gpu/drm/i915/dvo_ns2501.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_cmd_parser.c
index be09e7cd5afb5de4dba9869a2e3d4ef2dc0b2744,4cf6d020d5135e3da688e5c1f586c362189b5629..29184d6c002730d55438ae6d3b348b43a4d24b6c
--- 1/drivers/gpu/drm/i915/i915_cmd_parser.c
--- 2/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@@ -906,10 -402,10 +906,10 @@@ int i915_parse_cmds(struct intel_ring_b
                        length = ((*cmd & desc->length.mask) + LENGTH_BIAS);
  
                if ((batch_end - cmd) < length) {
 -                      DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%d batchlen=%td\n",
 +                      DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%u batchlen=%td\n",
                                         *cmd,
                                         length,
-                                        batch_end - cmd);
+                                        (unsigned long)(batch_end - cmd));
                        ret = -EINVAL;
                        break;
                }

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
index a01faea0401c02061f2b9d6adf01ded45de32db5,82f4d1f47d3b734c582b1d2b02b770039fb042fa..5d8250f7145dc23a6e19843d16fa181919e5c644
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -924,13 -945,17 +982,17 @@@ static int intel_runtime_resume(struct 
  
  static const struct dev_pm_ops i915_pm_ops = {
        .suspend = i915_pm_suspend,
+       .suspend_late = i915_pm_suspend_late,
+       .resume_early = i915_pm_resume_early,
        .resume = i915_pm_resume,
        .freeze = i915_pm_freeze,
+       .thaw_early = i915_pm_thaw_early,
        .thaw = i915_pm_thaw,
        .poweroff = i915_pm_poweroff,
+       .restore_early = i915_pm_resume_early,
        .restore = i915_pm_resume,
 -      .runtime_suspend = i915_runtime_suspend,
 -      .runtime_resume = i915_runtime_resume,
 +      .runtime_suspend = intel_runtime_suspend,
 +      .runtime_resume = intel_runtime_resume,
  };
  
  static const struct vm_operations_struct i915_gem_vm_ops = {

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge