diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-06-19 14:54:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-19 14:54:20 +1000 |
| commit | fd0ce8839f307693d86c7602dd926ce79e6b777d (patch) | |
| tree | a60e70fdf973ad62e0b5e6102a22226449fbb194 | |
| parent | 8ad0465e15bfc502abc259e886d6dcb448e0141a (diff) | |
add support for maxwell, minus Xv/renderaccel
More extensive acceleration will be via glamor, at least to begin with. It
seems to make sense to jump on the bandwagon now, and deal with any issues
that arise before it it becomes the standard for XWayland.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | src/nouveau_exa.c | 1 | ||||
| -rw-r--r-- | src/nouveau_xv.c | 2 | ||||
| -rw-r--r-- | src/nv_driver.c | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c index 2272d44..def66ac 100644 --- a/src/nouveau_exa.c +++ b/src/nouveau_exa.c @@ -519,6 +519,7 @@ nouveau_exa_init(ScreenPtr pScreen) exa->Composite = NVC0EXAComposite; exa->DoneComposite = NVC0EXADoneComposite; break; + case NV_MAXWELL: default: break; } diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c index 162b146..31a7950 100644 --- a/src/nouveau_xv.c +++ b/src/nouveau_xv.c @@ -2048,7 +2048,7 @@ NVSetupTexturedVideo (ScreenPtr pScreen, XF86VideoAdaptorPtr *textureAdaptor) textureAdaptor[0] = NV40SetupTexturedVideo(pScreen, FALSE); textureAdaptor[1] = NV40SetupTexturedVideo(pScreen, TRUE); } else - if (pNv->Architecture >= NV_TESLA) { + if (pNv->Architecture >= NV_TESLA && pNv->Architecture < NV_MAXWELL) { textureAdaptor[0] = NV50SetupTexturedVideo(pScreen); } } diff --git a/src/nv_driver.c b/src/nv_driver.c index 9e015de..b7d8e87 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -359,6 +359,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) case 0xe0: case 0xf0: case 0x100: + case 0x110: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02x\n", chipset); @@ -906,6 +907,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) case 0x100: pNv->Architecture = NV_KEPLER; break; + case 0x110: + pNv->Architecture = NV_MAXWELL; + break; default: return FALSE; } |