commit 77144554de9af353795698161af26e36f7cdbbef
author Francisco Jerez <currojerez@riseup.net> Sat Jul 10 17:37:00 2010 +0200
committer Ben Skeggs <bskeggs@redhat.com> Tue Jul 13 10:13:57 2010 +1000
tree 76386c65bd01af27eb3072803e22fa089aab9d8c
parent e88efe056d308d0a3b6b645d0eec7236b2d8c902

drm/nouveau: Fix crashes during fbcon init on single head cards.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/nouveau_fbcon.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 728f555..2fb2444 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -387,7 +387,8 @@
 	dev_priv->nfbdev = nfbdev;
 	nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
 
-	ret = drm_fb_helper_init(dev, &nfbdev->helper, 2, 4);
+	ret = drm_fb_helper_init(dev, &nfbdev->helper,
+				 nv_two_heads(dev) ? 2 : 1, 4);
 	if (ret) {
 		kfree(nfbdev);
 		return ret;