projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e88efe0
)
drm/nouveau: Fix crashes during fbcon init on single head cards.
author
Francisco Jerez
<currojerez@riseup.net>
Sat, 10 Jul 2010 15:37:00 +0000
(17:37 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 13 Jul 2010 00:13:57 +0000
(10:13 +1000)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_fbcon.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index
728f555
..
2fb2444
100644
(file)
--- 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;