Merge branch 'drm-intel-next-fixes' into drm-intel-next

So I've sent the first pull request to Dave and I expect his request
for a merge tree any second now ;-)

More seriously I have some pending patches for 3.19 that depend upon
both trees, hence backmerge. Conflicts are all trivial.

Conflicts:
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_display.c

v2: Of course I've forgotten the fixup script for the silent conflict.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
index 737b23982b958b8a2f7367818bdc6f8d8a5a1d35,f66392b6e287c3036f420c022241a74108c65527..f17bbf3ac136994464bc5881729d4db27a485c2c
--- 1/drivers/gpu/drm/i915/i915_irq.c
--- 2/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -3494,12 -3457,15 +3473,14 @@@ static void gen8_irq_reset(struct drm_d
  
  void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv)
  {
 -      unsigned long irqflags;
+       uint32_t extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN;
+ 
 -      spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
 +      spin_lock_irq(&dev_priv->irq_lock);
        GEN8_IRQ_INIT_NDX(DE_PIPE, PIPE_B, dev_priv->de_irq_mask[PIPE_B],
-                         ~dev_priv->de_irq_mask[PIPE_B]);
+                         ~dev_priv->de_irq_mask[PIPE_B] | extra_ier);
        GEN8_IRQ_INIT_NDX(DE_PIPE, PIPE_C, dev_priv->de_irq_mask[PIPE_C],
-                         ~dev_priv->de_irq_mask[PIPE_C]);
+                         ~dev_priv->de_irq_mask[PIPE_C] | extra_ier);
 -      spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 +      spin_unlock_irq(&dev_priv->irq_lock);
  }
  
  static void cherryview_irq_preinstall(struct drm_device *dev)

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 6fc77a100cc66ea9d29fb00df145e4d44e6894e7,c9e220963a784e1d147fc936f28a613e9522cf32..1fc05ffc469572647e6731780fb51ee8ad8d927f
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -73,9 -73,8 +73,6 @@@ static const uint32_t intel_cursor_form
        DRM_FORMAT_ARGB8888,
  };
  
- #define DIV_ROUND_CLOSEST_ULL(ll, d)  \
- ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })
- 
 -static void intel_increase_pllclock(struct drm_device *dev,
 -                                  enum pipe pipe);
  static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on);
  
  static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
@@@ -9771,11 -9930,9 +9778,8 @@@ static int intel_crtc_page_flip(struct 
        enum pipe pipe = intel_crtc->pipe;
        struct intel_unpin_work *work;
        struct intel_engine_cs *ring;
 -      unsigned long flags;
        int ret;
  
-       //trigger software GT busyness calculation
-       gen8_flip_interrupt(dev);
- 
        /*
         * drm_mode_page_flip_ioctl() should already catch this, but double
         * check to be safe.  In the future we may enable pageflipping from

diff --cc drivers/gpu/drm/i915/intel_drv.h
index ffbf38d9b5362a854a8c4b0a632ab0a9b93b0ae6,ba715229a54016324411687113d730fec801c479..94993d23e5475d8fbba11d0437f35d4a7e000eec
--- 1/drivers/gpu/drm/i915/intel_drv.h
--- 2/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -34,8 -34,10 +34,11 @@@
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_dp_mst_helper.h>
 +#include <drm/drm_rect.h>
  
+ #define DIV_ROUND_CLOSEST_ULL(ll, d)  \
+ ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; })
+ 
  /**
   * _wait_for - magic (register) wait macro
   *

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

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

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