diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-06-26 12:12:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-26 12:16:43 +0100 |
| commit | 9bd0c15fcfb42f6245447c53347d65ad9e72080b (patch) | |
| tree | 338d1d19fcb9f76e62ef951b568a8d97a00012ec /drivers | |
| parent | d42f0349f3fed647c61c2d432e974bbdafcfb3fb (diff) | |
| download | linux-3.10-9bd0c15fcfb42f6245447c53347d65ad9e72080b.tar.gz linux-3.10-9bd0c15fcfb42f6245447c53347d65ad9e72080b.tar.bz2 linux-3.10-9bd0c15fcfb42f6245447c53347d65ad9e72080b.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 153b9a15469..1074bc5dd41 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; |