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

Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_irq.c

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

diff --cc drivers/gpu/drm/i915/i915_drv.h
index f9e9f9840dea3a2717b4963142e7adc449bd1038,65dfe81d0035bc9ced9636c1397373c6664e5e20..92f4d33216cd86c9966db00599c49b03ea4add93
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -962,7 -958,7 +962,8 @@@ extern unsigned int i915_fbpercrtc
  extern unsigned int i915_powersave;
  extern unsigned int i915_lvds_downclock;
  extern unsigned int i915_panel_use_ssc;
 +extern int i915_vbt_sdvo_panel_type;
+ extern unsigned int i915_enable_rc6;
  
  extern int i915_suspend(struct drm_device *dev, pm_message_t state);
  extern int i915_resume(struct drm_device *dev);

diff --cc drivers/gpu/drm/i915/i915_irq.c
index da3edf891c2117937d994dc0c3491dba5842a443,8a9e08bf1cf74d3a9ba9060a8523e394593a09bd..346dd85cbbd3114b04370214a897df41738870dd
--- 1/drivers/gpu/drm/i915/i915_irq.c
--- 2/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -1642,14 -1646,12 +1644,16 @@@ static int ironlake_irq_postinstall(str
        POSTING_READ(GTIER);
  
        if (HAS_PCH_CPT(dev)) {
--              hotplug_mask = SDE_CRT_HOTPLUG_CPT | SDE_PORTB_HOTPLUG_CPT  |
--                             SDE_PORTC_HOTPLUG_CPT | SDE_PORTD_HOTPLUG_CPT ;
++              hotplug_mask = (SDE_CRT_HOTPLUG_CPT |
++                              SDE_PORTB_HOTPLUG_CPT |
++                              SDE_PORTC_HOTPLUG_CPT |
++                              SDE_PORTD_HOTPLUG_CPT);
        } else {
--              hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG |
--                             SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG;
-               hotplug_mask |= SDE_AUX_MASK | SDE_FDI_MASK | SDE_TRANS_MASK;
-               for_each_pipe(pipe)
-                       I915_WRITE(FDI_RX_IMR(pipe), 0);
 -              hotplug_mask |= SDE_AUX_MASK;
++              hotplug_mask = (SDE_CRT_HOTPLUG |
++                              SDE_PORTB_HOTPLUG |
++                              SDE_PORTC_HOTPLUG |
++                              SDE_PORTD_HOTPLUG |
++                              SDE_AUX_MASK);
        }
  
        dev_priv->pch_irq_mask = ~hotplug_mask;

diff --cc drivers/gpu/drm/i915/i915_reg.h
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_drv.h
Simple merge

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

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

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

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