Merge tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

 Highlights:
- follow-up refactoring after the shared dpll rework that landed in 3.11
- oddball prep cleanups from Ben for ppgtt
- encoder->get_config state tracking infrastructure from Jesse
- used by the experimental fastboot support from Jesse (disabled by
  default)
- make the error state file official and add it to our sysfs interface
  (Mika)
- drm_mm prep changes from Ben, prepares to embedd the drm_mm_node (which
  will be used by the vma rework later on)
- interrupt handling rework, follow up cleanups to the VECS enabling, hpd
  storm handling and fifo underrun reporting.
- Big pile of smaller cleanups, code improvements and related stuff.

* tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel: (72 commits)
  drm/i915: clear DPLL reg when disabling i9xx dplls
  drm/i915: Fix up cpt pixel multiplier enable sequence
  drm/i915: clean up vlv ->pre_pll_enable and pll enable sequence
  drm/i915: move error state to own compilation unit
  drm/i915: Don't attempt to read an unitialized stack value
  drm/i915: Use for_each_pipe() when possible
  drm/i915: don't enable PM_VEBOX_CS_ERROR_INTERRUPT
  drm/i915: unify ring irq refcounts (again)
  drm/i915: kill dev_priv->rps.lock
  drm/i915: queue work outside spinlock in hsw_pm_irq_handler
  drm/i915: streamline hsw_pm_irq_handler
  drm/i915: irq handlers don't need interrupt-safe spinlocks
  drm/i915: kill lpt pch transcoder->crtc mapping code for fifo underruns
  drm/i915: improve GEN7_ERR_INT clearing for fifo underrun reporting
  drm/i915: improve SERR_INT clearing for fifo underrun reporting
  drm/i915: extract ibx_display_interrupt_update
  drm/i915: remove unused members from drm_i915_private
  drm/i915: don't frob mm.suspended when not using ums
  drm/i915: Fix VLV DP RBR/HDMI/DAC PLL LPF coefficients
  drm/i915: WARN if the bios reserved range is bigger than stolen size
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c

1 files changed, 21 insertions, 12 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f4af1ca0fb62..b07362f2675e 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -132,6 +132,11 @@ int i915_enable_ips __read_mostly = 1;
 module_param_named(enable_ips, i915_enable_ips, int, 0600);
 MODULE_PARM_DESC(enable_ips, "Enable IPS (default: true)");
 
+bool i915_fastboot __read_mostly = 0;
+module_param_named(fastboot, i915_fastboot, bool, 0600);
+MODULE_PARM_DESC(fastboot, "Try to skip unnecessary mode sets at boot time "
+                 "(default: false)");
+
 static struct drm_driver driver;
 extern int intel_agp_enabled;
 
@@ -551,7 +556,11 @@ static int i915_drm_freeze(struct drm_device *dev)
 
         /* If KMS is active, we do the leavevt stuff here */
         if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                int error = i915_gem_idle(dev);
+                int error;
+
+                mutex_lock(&dev->struct_mutex);
+                error = i915_gem_idle(dev);
+                mutex_unlock(&dev->struct_mutex);
                 if (error) {
                         dev_err(&dev->pdev->dev,
                                 "GEM idle failed, resume might fail\n");
@@ -656,7 +665,6 @@ static int __i915_drm_thaw(struct drm_device *dev)
                 intel_init_pch_refclk(dev);
 
                 mutex_lock(&dev->struct_mutex);
-                dev_priv->mm.suspended = 0;
 
                 error = i915_gem_init_hw(dev);
                 mutex_unlock(&dev->struct_mutex);
@@ -793,28 +801,29 @@ static int i965_reset_complete(struct drm_device *dev)
 static int i965_do_reset(struct drm_device *dev)
 {
         int ret;
-        u8 gdrst;
 
         /*
          * Set the domains we want to reset (GRDOM/bits 2 and 3) as
          * well as the reset bit (GR/bit 0).  Setting the GR bit
          * triggers the reset; when done, the hardware will clear it.
          */
-        pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst);
         pci_write_config_byte(dev->pdev, I965_GDRST,
-                              gdrst | GRDOM_RENDER |
-                              GRDOM_RESET_ENABLE);
+                              GRDOM_RENDER | GRDOM_RESET_ENABLE);
         ret =  wait_for(i965_reset_complete(dev), 500);
         if (ret)
                 return ret;
 
         /* We can't reset render&media without also resetting display ... */
-        pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst);
         pci_write_config_byte(dev->pdev, I965_GDRST,
-                              gdrst | GRDOM_MEDIA |
-                              GRDOM_RESET_ENABLE);
+                              GRDOM_MEDIA | GRDOM_RESET_ENABLE);
 
-        return wait_for(i965_reset_complete(dev), 500);
+        ret =  wait_for(i965_reset_complete(dev), 500);
+        if (ret)
+                return ret;
+
+        pci_write_config_byte(dev->pdev, I965_GDRST, 0);
+
+        return 0;
 }
 
 static int ironlake_do_reset(struct drm_device *dev)
@@ -955,11 +964,11 @@ int i915_reset(struct drm_device *dev)
          * switched away).
          */
         if (drm_core_check_feature(dev, DRIVER_MODESET) ||
-                        !dev_priv->mm.suspended) {
+                        !dev_priv->ums.mm_suspended) {
                 struct intel_ring_buffer *ring;
                 int i;
 
-                dev_priv->mm.suspended = 0;
+                dev_priv->ums.mm_suspended = 0;
 
                 i915_gem_init_swizzling(dev);