From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 16 Feb 2011 09:36:05 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9035a97a32836d0e456ddafaaf249a844e6e4b5e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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
---

9035a97a32836d0e456ddafaaf249a844e6e4b5e
diff --cc drivers/gpu/drm/i915/i915_drv.h
index f9e9f9840dea,65dfe81d0035..92f4d33216cd
--- a/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 da3edf891c21,8a9e08bf1cf7..346dd85cbbd3
--- a/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;