Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...

diff --combined shared-core/i915_init.c
index 7616b33,ebe7381..1a8af0a
--- 1/shared-core/i915_init.c
--- 2/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@@ -193,6 -193,8 +193,6 @@@ int i915_driver_load(drm_device_t *dev
                                 0, PAGE_SIZE, 0,
                                 &entry);
  
 -      DRM_DEBUG("allocated bo, start: 0x%lx, offset: 0x%lx\n",
 -                entry->buffer_start, entry->offset);
        intel_modeset_init(dev);
  
        fb = drm_framebuffer_create(dev);
@@@ -211,8 -213,6 +211,6 @@@
  
        drm_initial_config(dev, fb, false);
        drmfb_probe(dev, fb);
-         drm_set_desired_modes(dev);
- 
  #if 0
        /* FIXME: command ring needs AGP space, do we own it at this point? */
        dev_priv->ring.Start = dev_priv->baseaddr;