From f402805b22e4f4f735924d59c69474b24e623a25 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Fri, 30 Nov 2012 10:07:51 -0500
Subject: [PATCH] radeon: avoid copying over itself ddx fb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---
src/drmmode_display.c | 9 +++++++++
1 file changed, 9 insertions(+)
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;
--
1.8.1.2