xf86-video-ati: Branch 'master'

[Jerome Glisse]

 src/drmmode_display.c |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit f402805b22e4f4f735924d59c69474b24e623a25
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Fri Nov 30 10:07:51 2012 -0500

    radeon: avoid copying over itself ddx fb
    
    In some rare case it seems that the old fb could already be the
    ddx fb. As copying from the same bo will trigger a ttm deadlck
    detection which will result in infinite kernel/userspace loop.
    Avoid doing any copy as anyway it's useless.
    
    Signed-off-by: Jerome Glisse <jglisse at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 9b9fc83..d00e60d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -292,6 +292,15 @@ void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
 	if (!fbcon_id)
 		goto fallback;
 
+	if (fbcon_id == drmmode->fb_id) {
+		/* in some rare case there might be no fbcon and we might already
+		 * be the one with the current fb to avoid a false deadlck in
+		 * kernel ttm code just do nothing as anyway there is nothing
+		 * to do
+		 */
+		return;
+	}
+
 	src = create_pixmap_for_fbcon(drmmode, pScrn, fbcon_id);
 	if (!src)
 		goto fallback;