---

yaml --- r: 204998 b: refs/heads/master c: 90c1efd h: refs/heads/master v: v3
git-mirror · Jul 21, 2010 · 9cecbc2 · 9cecbc2
1 parent 201eeda
commit 9cecbc2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92897b5c669f5e819ff2596fe6228ca2e4904981
+refs/heads/master: 90c1efdd121c84ee73e9960667229a662f2315a3
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -2617,6 +2617,15 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
 		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;