diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-07-10 17:37:00 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-21 08:40:05 +1000 |
| commit | 7173aeff025a7fed3fa903e362bf773e6258dd47 (patch) | |
| tree | 2db070e62b7a4a7560fa5fa28df5d194d79ead3d /drivers/gpu | |
| parent | 14d7ec11d165fe11c2bce5b412773af70b7c8e1b (diff) | |
| download | linux-7173aeff025a7fed3fa903e362bf773e6258dd47.tar.gz linux-7173aeff025a7fed3fa903e362bf773e6258dd47.tar.bz2 linux-7173aeff025a7fed3fa903e362bf773e6258dd47.zip | |
drm/nouveau: Fix crashes during fbcon init on single head cards.
this fixes a regression since the fbcon rework.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index c9a4a0d2a115..257ea130ae13 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -387,7 +387,8 @@ int nouveau_fbcon_init(struct drm_device *dev) 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; |