diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-10-16 15:10:10 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-10-27 20:33:06 -0400 |
| commit | 1516d35b06c9cda399bef01d992805d6e63dcbae (patch) | |
| tree | 040255f259b970bad505c04b23ab6f3dc4d94b33 | |
| parent | b00b73c3aa0da1d4cee5c9f580ca65a7bd344e0f (diff) | |
recognize and accelerate GM20x
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
| -rw-r--r-- | src/nv_driver.c | 2 | ||||
| -rw-r--r-- | src/nvc0_accel.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c index fff83f8..61940a8 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -390,6 +390,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) case 0xf0: case 0x100: case 0x110: + case 0x120: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02X\n", chipset); @@ -941,6 +942,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) pNv->Architecture = NV_KEPLER; break; case 0x110: + case 0x120: pNv->Architecture = NV_MAXWELL; break; default: diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c index d0a835e..6c2bae8 100644 --- a/src/nvc0_accel.c +++ b/src/nvc0_accel.c @@ -244,9 +244,17 @@ NVAccelInit3D_NVC0(ScrnInfoPtr pScrn) } else if (pNv->dev->chipset < 0x110) { class = 0xa197; handle = 0x0000906e; - } else { + } else if (pNv->dev->chipset < 0x120) { class = 0xb097; handle = 0x0000906e; + } else if (pNv->dev->chipset < 0x130) { + class = 0xb197; + handle = 0x0000906e; + } else { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "No 3D acceleration support for NV%X\n", + pNv->dev->chipset); + return FALSE; } ret = nouveau_object_new(pNv->channel, class, class, |