diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-13 15:29:15 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-13 15:29:41 -0400 |
| commit | 1ff13a922535924681b91452235b017e43a4c6f6 (patch) | |
| tree | ba5ccaf1fb4586822ec86b3b243e70f8bd21b4c7 | |
| parent | 3bb943b33bbe8e593afc00d13fe867dd7a708c3c (diff) | |
fix build after glamor removal
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
| -rw-r--r-- | src/drmmode_display.c | 1 | ||||
| -rw-r--r-- | src/nv_driver.c | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 6495961..dc2e0ac 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -104,7 +104,6 @@ drmmode_from_scrn(ScrnInfoPtr scrn) static inline struct nouveau_pixmap * drmmode_pixmap(PixmapPtr ppix) { - NVPtr pNv = NVPTR(xf86ScreenToScrn(ppix->drawable.pScreen)); return nouveau_pixmap(ppix); } diff --git a/src/nv_driver.c b/src/nv_driver.c index c3bd41b..4dde8e0 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1051,12 +1051,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) } if (pNv->AccelMethod == UNKNOWN) { -#ifdef HAVE_GLAMOR - if (pNv->Architecture >= NV_MAXWELL) - pNv->AccelMethod = GLAMOR; - else -#endif - pNv->AccelMethod = EXA; + pNv->AccelMethod = EXA; } if (xf86ReturnOptValBool(pNv->Options, OPTION_NOACCEL, FALSE)) { @@ -1084,10 +1079,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) /* Define maximum allowed level of DRI implementation to use. * We default to DRI2 on EXA for now, as DRI3 still has some - * problems. However, the max_dri_level can be only honored - * by EXA, as GLAMOR only supports DRI3 at the moment. + * problems. */ - pNv->max_dri_level = (pNv->AccelMethod == GLAMOR) ? 3 : 2; + pNv->max_dri_level = 2; from = X_DEFAULT; if (xf86GetOptValInteger(pNv->Options, OPTION_DRI, |