41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 9bd0c15fcfb42f6245447c53347d65ad9e72080b Mon Sep 17 00:00:00 2001
|
|
From: Ben Skeggs <bskeggs@redhat.com>
|
|
Date: Tue, 26 Jun 2012 12:12:30 +1000
|
|
Subject: [PATCH] drm/nouveau/fbcon: using nv_two_heads is not a good idea
|
|
|
|
nv_two_heads() was never meant to be used outside of pre-nv50 code. The
|
|
code checks for >= NV_10 for 2 CRTCs, then downgrades a few specific
|
|
chipsets to 1 CRTC based on (pci_device & 0x0ff0).
|
|
|
|
The breakage example seen is on GTX 560Ti, with a pciid of 0x1200, which
|
|
gets detected as an NV20 (0x020x) with 1 CRTC by nv_two_heads(), causing
|
|
memory corruption because there's actually 2 CRTCs..
|
|
|
|
This switches fbcon to use the CRTC count directly from the mode_config
|
|
structure, which will also fix the same issue on Kepler boards which have
|
|
4 CRTCs.
|
|
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
---
|
|
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
|
|
index 153b9a1..1074bc5 100644
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
|
|
@@ -467,7 +467,7 @@ int nouveau_fbcon_init(struct drm_device *dev)
|
|
nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
|
|
|
|
ret = drm_fb_helper_init(dev, &nfbdev->helper,
|
|
- nv_two_heads(dev) ? 2 : 1, 4);
|
|
+ dev->mode_config.num_crtc, 4);
|
|
if (ret) {
|
|
kfree(nfbdev);
|
|
return ret;
|
|
--
|
|
1.7.10.2
|
|
|