Francisco Jerez
2009-Dec-26 14:59 UTC
[Nouveau] [PATCH] dri: Use classic mesa on the fixed pipe cards.
Signed-off-by: Francisco Jerez <currojerez at riseup.net> --- src/nouveau_dri2.c | 6 +++++- src/nv_dri.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 4bc019b..2388070 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -154,8 +154,12 @@ nouveau_dri2_init(ScreenPtr pScreen) return FALSE; } + if (pNv->Architecture >= NV_ARCH_30) + dri2.driverName = "nouveau"; + else + dri2.driverName = "nouveau_vieux"; + dri2.fd = nouveau_device(pNv->dev)->fd; - dri2.driverName = "nouveau"; dri2.deviceName = pNv->drm_device_name; dri2.version = DRI2INFOREC_VERSION; diff --git a/src/nv_dri.c b/src/nv_dri.c index c053022..da27d06 100644 --- a/src/nv_dri.c +++ b/src/nv_dri.c @@ -247,8 +247,12 @@ Bool NVDRIScreenInit(ScrnInfoPtr pScrn) drm_page_size = getpagesize(); if (!(pDRIInfo = DRICreateInfoRec())) return FALSE; + if (pNv->Architecture >= NV_ARCH_30) + pDRIInfo->clientDriverName = "nouveau"; + else + pDRIInfo->clientDriverName = "nouveau_vieux"; + pDRIInfo->drmDriverName = "nouveau"; - pDRIInfo->clientDriverName = "nouveau"; pDRIInfo->busIdString = DRICreatePCIBusID(pNv->PciInfo); pDRIInfo->ddxDriverMajorVersion = NV_MAJOR_VERSION; -- 1.6.4.4
Ben Skeggs
2009-Dec-27 00:48 UTC
[Nouveau] [PATCH] dri: Use classic mesa on the fixed pipe cards.
On Sat, 2009-12-26 at 15:59 +0100, Francisco Jerez wrote:> Signed-off-by: Francisco Jerez <currojerez at riseup.net>Signed-off-by: Ben Skeggs <bskeggs at redhat.com>> --- > src/nouveau_dri2.c | 6 +++++- > src/nv_dri.c | 6 +++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c > index 4bc019b..2388070 100644 > --- a/src/nouveau_dri2.c > +++ b/src/nouveau_dri2.c > @@ -154,8 +154,12 @@ nouveau_dri2_init(ScreenPtr pScreen) > return FALSE; > } > > + if (pNv->Architecture >= NV_ARCH_30) > + dri2.driverName = "nouveau"; > + else > + dri2.driverName = "nouveau_vieux"; > + > dri2.fd = nouveau_device(pNv->dev)->fd; > - dri2.driverName = "nouveau"; > dri2.deviceName = pNv->drm_device_name; > > dri2.version = DRI2INFOREC_VERSION; > diff --git a/src/nv_dri.c b/src/nv_dri.c > index c053022..da27d06 100644 > --- a/src/nv_dri.c > +++ b/src/nv_dri.c > @@ -247,8 +247,12 @@ Bool NVDRIScreenInit(ScrnInfoPtr pScrn) > drm_page_size = getpagesize(); > if (!(pDRIInfo = DRICreateInfoRec())) return FALSE; > > + if (pNv->Architecture >= NV_ARCH_30) > + pDRIInfo->clientDriverName = "nouveau"; > + else > + pDRIInfo->clientDriverName = "nouveau_vieux"; > + > pDRIInfo->drmDriverName = "nouveau"; > - pDRIInfo->clientDriverName = "nouveau"; > pDRIInfo->busIdString = DRICreatePCIBusID(pNv->PciInfo); > > pDRIInfo->ddxDriverMajorVersion = NV_MAJOR_VERSION;