Merge tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull ACPI and power management fixes from Rafael Wysocki:
 "These are just two fixes, a revert of the would-be backlight fix that
  didn't work and an intel_pstate fix for two problems related to
  maximum P-state selection.

  Specifics:

   - Revert of the ACPI video commit that I hoped would help fix
     backlight problems related to Windows 8 compatibility on some
     systems.  Unfortunately, it turned out to cause problems to happen
     too.

   - Fix for two problems in intel_pstate, a possible failure to respond
     to a load change on a quiet system and a possible failure to select
     the highest available P-state on some systems.  From Dirk
     Brandewie"

* tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
  cpufreq / intel_pstate: Change to scale off of max P-state

diff --combined drivers/gpu/drm/i915/i915_dma.c
index 67ec54f67afe2d7a56cbabda7800819bfee753ac,adb319b53ecd4acb98e1ce35f599ea935ff83dce..abf158da9b30bcc7cab3c33e4064d63adef46220
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -1495,14 -1495,6 +1495,14 @@@ int i915_driver_load(struct drm_device 
        dev_priv->dev = dev;
        dev_priv->info = info;
  
 +      spin_lock_init(&dev_priv->irq_lock);
 +      spin_lock_init(&dev_priv->gpu_error.lock);
 +      spin_lock_init(&dev_priv->rps.lock);
 +      spin_lock_init(&dev_priv->backlight.lock);
 +      mutex_init(&dev_priv->dpio_lock);
 +      mutex_init(&dev_priv->rps.hw_lock);
 +      mutex_init(&dev_priv->modeset_restore_lock);
 +
        i915_dump_device_info(dev_priv);
  
        if (i915_get_bridge_dev(dev)) {
@@@ -1593,7 -1585,6 +1593,7 @@@
        intel_detect_pch(dev);
  
        intel_irq_init(dev);
 +      intel_gt_sanitize(dev);
        intel_gt_init(dev);
  
        /* Try to make sure MCHBAR is enabled before poking at it */
@@@ -1619,6 -1610,15 +1619,6 @@@
        if (!IS_I945G(dev) && !IS_I945GM(dev))
                pci_enable_msi(dev->pdev);
  
 -      spin_lock_init(&dev_priv->irq_lock);
 -      spin_lock_init(&dev_priv->gpu_error.lock);
 -      spin_lock_init(&dev_priv->rps.lock);
 -      spin_lock_init(&dev_priv->backlight.lock);
 -      mutex_init(&dev_priv->dpio_lock);
 -
 -      mutex_init(&dev_priv->rps.hw_lock);
 -      mutex_init(&dev_priv->modeset_restore_lock);
 -
        dev_priv->num_plane = 1;
        if (IS_VALLEYVIEW(dev))
                dev_priv->num_plane = 2;
@@@ -1648,7 -1648,7 +1648,7 @@@
        if (INTEL_INFO(dev)->num_pipes) {
                /* Must be done after probing outputs */
                intel_opregion_init(dev);
-               acpi_video_register_with_quirks();
+               acpi_video_register();
        }
  
        if (IS_GEN5(dev))