Merge branch 'drm-intel-next' of ../anholt-2.6 into drm-linus

diff --combined drivers/gpu/drm/i915/i915_dma.c
index 9648d79,0b9984f..c23b3a9
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -922,7 -922,7 +922,7 @@@ static int i915_probe_agp(struct drm_de
         * Some of the preallocated space is taken by the GTT
         * and popup.  GTT is 1K per MB of aperture size, and popup is 4K.
         */
-       if (IS_G4X(dev))
+       if (IS_G4X(dev) || IS_IGD(dev))
                overhead = 4096;
        else
                overhead = (*aperture_size / 1024) + 4096;
@@@ -1030,13 -1030,6 +1030,6 @@@ static int i915_load_modeset_init(struc
        if (ret)
                goto destroy_ringbuffer;
  
-       /* FIXME: re-add hotplug support */
- #if 0
-       ret = drm_hotplug_init(dev);
-       if (ret)
-               goto destroy_ringbuffer;
- #endif
- 
        /* Always safe in the mode setting case. */
        /* FIXME: do pre/post-mode set stuff in core KMS code */
        dev->vblank_disable_allowed = 1;
@@@ -1049,7 -1042,7 +1042,7 @@@
  
        intel_modeset_init(dev);
  
 -      drm_helper_initial_config(dev, false);
 +      drm_helper_initial_config(dev);
  
        return 0;