Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

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

diff --cc drivers/gpu/drm/Kconfig
index 45536db74d8cefbfe81ec54da14168255a456554,90e28081712dbd7c68343f88bd10b468c10f604a..3a8c68345fe2b3e9142430a442511662ec2430a5
--- 1/drivers/gpu/drm/Kconfig
--- 2/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -22,8 -22,8 +22,9 @@@ menuconfig DR
  config DRM_USB
        tristate
        depends on DRM
+       depends on USB_ARCH_HAS_HCD
        select USB
 +      select USB_SUPPORT
  
  config DRM_KMS_HELPER
        tristate

diff --cc drivers/gpu/drm/i915/i915_gem.c
index 051459324826218962ce0f83aca3c02701e7b318,489e2b162b2736b4fc3d43e171ebddb25c66b12e..31054fa44c47942cb8ae41aa1b1a7a0088db56a3
--- 1/drivers/gpu/drm/i915/i915_gem.c
--- 2/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -2277,9 -2369,13 +2277,9 @@@ int i915_gpu_idle(struct drm_device *de
                if (ret)
                        return ret;
  
-               ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
+               ret = i915_ring_idle(ring);
                if (ret)
                        return ret;
 -
 -              /* Is the device fubar? */
 -              if (WARN_ON(!list_empty(&ring->gpu_write_list)))
 -                      return -EBUSY;
        }
  
        return 0;

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_modes.c
index 7a5238fc1a02510c37211b48db2bcdcc33d6ef58,29b72593fbb276fbce8b2ae00828cc7c48a06bf3..4bc1c0fc342ad10ac5545d278ced8c3456fcbb2a
--- 1/drivers/gpu/drm/i915/intel_modes.c
--- 2/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@@ -32,6 -32,25 +32,24 @@@
  #include "intel_drv.h"
  #include "i915_drv.h"
  
 -      connector->display_info.raw_edid = NULL;
+ /**
+  * intel_connector_update_modes - update connector from edid
+  * @connector: DRM connector device to use
+  * @edid: previously read EDID information
+  */
+ int intel_connector_update_modes(struct drm_connector *connector,
+                               struct edid *edid)
+ {
+       int ret;
+ 
+       drm_mode_connector_update_edid_property(connector, edid);
+       ret = drm_add_edid_modes(connector, edid);
+       drm_edid_to_eld(connector, edid);
+       kfree(edid);
+ 
+       return ret;
+ }
+ 
  /**
   * intel_ddc_get_modes - get modelist from monitor
   * @connector: DRM connector device to use

diff --cc drivers/gpu/drm/i915/intel_pm.c
index c0407aa5baac14d5bfa0115ed819287f77fca6ec,1881c8c83f0e0c44ab009dfed7049235c4074d97..9b05f7832dc2f46ed59df10adaf70846b497777f
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -2479,20 -2438,13 +2479,13 @@@ static void gen6_enable_rps(struct drm_
  
        I915_WRITE(GEN6_RP_DOWN_TIMEOUT, 1000000);
        I915_WRITE(GEN6_RP_INTERRUPT_LIMITS,
 -                 dev_priv->max_delay << 24 |
 -                 dev_priv->min_delay << 16);
 +                 dev_priv->rps.max_delay << 24 |
 +                 dev_priv->rps.min_delay << 16);
  
-       if (IS_HASWELL(dev)) {
-               I915_WRITE(GEN6_RP_UP_THRESHOLD, 59400);
-               I915_WRITE(GEN6_RP_DOWN_THRESHOLD, 245000);
-               I915_WRITE(GEN6_RP_UP_EI, 66000);
-               I915_WRITE(GEN6_RP_DOWN_EI, 350000);
-       } else {
-               I915_WRITE(GEN6_RP_UP_THRESHOLD, 10000);
-               I915_WRITE(GEN6_RP_DOWN_THRESHOLD, 1000000);
-               I915_WRITE(GEN6_RP_UP_EI, 100000);
-               I915_WRITE(GEN6_RP_DOWN_EI, 5000000);
-       }
+       I915_WRITE(GEN6_RP_UP_THRESHOLD, 59400);
+       I915_WRITE(GEN6_RP_DOWN_THRESHOLD, 245000);
+       I915_WRITE(GEN6_RP_UP_EI, 66000);
+       I915_WRITE(GEN6_RP_DOWN_EI, 350000);
  
        I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
        I915_WRITE(GEN6_RP_CONTROL,

diff --cc include/drm/drm_crtc.h
Simple merge