Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7173aeff authored by Francisco Jerez's avatar Francisco Jerez Committed by Dave Airlie
Browse files

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



this fixes a regression since the fbcon rework.

Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 14d7ec11

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -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;