From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Fri, 18 May 2007 16:42:51 +0000 (-0700)
Subject: Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into... 
X-Git-Tag: libdrm-2.4.3~16^2~400
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4929b921e44dcd3cae8e384b9b7eabc51db28ff;p=platform%2Fupstream%2Flibdrm.git

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

Conflicts:

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

a4929b921e44dcd3cae8e384b9b7eabc51db28ff
diff --cc linux-core/drm_crtc.c
index e5a4b32,1586eb1..245fe5b
--- a/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);