From 8d7080e30e05bac4aa6ebcb7783404495ae73899 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 26 Aug 2011 09:40:39 +1000
Subject: [PATCH] --- yaml --- r: 269693 b: refs/heads/master c:
 84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33 h: refs/heads/master i:   269691:
 72608b15a36879e3f72ecc91d2ffcd12a81962e7 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nvd0_display.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0be954ac66e0..b074cd9bbb33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c20ab3e1cb0bb8e2c9a54a49b4637c61512ed856
+refs/heads/master: 84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33
diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
index 20072fb784a5..23d63b4b3d77 100644
--- a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -391,6 +391,11 @@ nvd0_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
 	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
 	int ret;
 
+	if (!crtc->fb) {
+		NV_DEBUG_KMS(crtc->dev, "No FB bound\n");
+		return 0;
+	}
+
 	ret = nvd0_crtc_swap_fbs(crtc, old_fb);
 	if (ret)
 		return ret;