[gentoo-commits] linux-patches r1803 - genpatches-2.6/trunk/2.6.35

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-09-29 14:29:52 +0000 (Wed, 29 Sep 2010)
New Revision: 1803

Added:
   genpatches-2.6/trunk/2.6.35/2700_drm-fix-unbinding-framebuffer-race-cond.patch
Modified:
   genpatches-2.6/trunk/2.6.35/0000_README
Log:
Fix race cond. between unbinding a fb on a hotplug event and user space flip

Modified: genpatches-2.6/trunk/2.6.35/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.35/0000_README	2010-09-29 12:52:11 UTC (rev 1802)
+++ genpatches-2.6/trunk/2.6.35/0000_README	2010-09-29 14:29:52 UTC (rev 1803)
@@ -71,6 +71,10 @@
 From:   http://bugs.gentoo.org/show_bug.cgi?id=318365
 Desc:   create /sys/fs/cgroup to mount cgroupfs to support systemd
 
+Patch:	2700_drm-fix-unbinding-framebuffer-race-cond.patch
+From:	http://bugs.gentoo.org/show_bug.cgi?id=336701
+Desc:	Fix race cond. between unbinding a fb on a hotplug event and user space flip
+
 Patch:	2900_xconfig-with-qt4.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=320761
 Desc:	xconfig patch for qt4 - thanks to Sam Iam

Added: genpatches-2.6/trunk/2.6.35/2700_drm-fix-unbinding-framebuffer-race-cond.patch
===================================================================
--- genpatches-2.6/trunk/2.6.35/2700_drm-fix-unbinding-framebuffer-race-cond.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.35/2700_drm-fix-unbinding-framebuffer-race-cond.patch	2010-09-29 14:29:52 UTC (rev 1803)
@@ -0,0 +1,18 @@
+--- a/drivers/gpu/drm/drm_crtc.c	2010-09-29 10:10:59.000000000 -0400
++++ b/drivers/gpu/drm/drm_crtc.c	2010-09-29 10:12:56.000000000 -0400
+@@ -2609,6 +2609,15 @@ int drm_mode_page_flip_ioctl(struct drm_
+ 	if (!obj)
+ 		goto out;
+ 	crtc = obj_to_crtc(obj);
++ 
++	if (crtc->fb == NULL) {
++		/* The framebuffer is currently unbound, presumably
++		 * due to a hotplug event, that userspace has not
++		 * yet discovered.
++		 */
++		ret = -EBUSY;
++		goto out;
++	}
+ 
+ 	if (crtc->funcs->page_flip == NULL)
+ 		goto out;