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

Conflicts:

	linux-core/drm_crtc.c - reconcile with locking changes

diff --cc linux-core/drm_crtc.c
index e5a4b32,1586eb1..245fe5b
--- 1/linux-core/drm_crtc.c
--- 2/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@@ -857,15 -886,7 +856,10 @@@ clone
   */
  bool drm_initial_config(drm_device_t *dev, bool can_grow)
  {
-       /* do a hardcoded initial configuration here */
-       struct drm_display_mode *des_mode = NULL;
        struct drm_output *output;
-       struct drm_framebuffer *fb;
-       drm_buffer_object_t *fbo;
-       unsigned long size, bytes_per_pixel;
 +      int ret = false;
 +
 +      spin_lock(&dev->mode_config.config_lock);
  
        drm_crtc_probe_output_modes(dev, 2048, 2048);
  
@@@ -918,9 -902,7 +875,8 @@@
        }
        drm_disable_unused_functions(dev);
  
- out:
 -      return false;
 +      spin_unlock(&dev->mode_config.config_lock);
 +      return ret;
  }
  EXPORT_SYMBOL(drm_initial_config);
  

diff --cc linux-core/drm_crtc.h
Simple merge

diff --cc linux-core/drm_fb.c
Simple merge

diff --cc linux-core/intel_fb.c
Simple merge