From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 25 Aug 2011 23:40:39 +0000 (+1000)
Subject: drm/nvd9/disp: bail out of mode_set_base if no fb bound to crtc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=84e2ad8b7b0e9f089d0f2ac9b1c32105bffb8b33;p=openwrt%2Fstaging%2Fblogic.git

drm/nvd9/disp: bail out of mode_set_base if no fb bound to crtc

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 20072fb784a5..23d63b4b3d77 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/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;