diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-12-09 12:44:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-09 12:44:41 +1000 |
| commit | 0c670a6d406fe0a57373fa9e03005be6f28ecc3e (patch) | |
| tree | 9b3faecb1e613206e215dcd413ece8139d142dda | |
| parent | 5d3d20d908a50ad7742567d58969c7f12dd944f7 (diff) | |
| download | xorg-driver-xf86-video-nouveau-0c670a6d406fe0a57373fa9e03005be6f28ecc3e.tar.gz | |
nvc0: don't try and create DmaNotifier0
| -rw-r--r-- | src/nv_accel_common.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c index 4c2ad97..be233ed 100644 --- a/src/nv_accel_common.c +++ b/src/nv_accel_common.c @@ -614,7 +614,8 @@ NVAccelCommonInit(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVAccelCommonInit\n"); /* General engine objects */ - INIT_CONTEXT_OBJECT(DmaNotifier0); + if (pNv->Architecture < NV_ARCH_C0) + INIT_CONTEXT_OBJECT(DmaNotifier0); /* 2D engine */ if (pNv->Architecture < NV_ARCH_50) { @@ -675,27 +676,20 @@ void NVAccelFree(ScrnInfoPtr pScrn) nouveau_notifier_free(&pNv->notify0); nouveau_notifier_free(&pNv->vblank_sem); - if (pNv->Architecture < NV_ARCH_50) { - nouveau_grobj_free(&pNv->NvContextSurfaces); - nouveau_grobj_free(&pNv->NvContextBeta1); - nouveau_grobj_free(&pNv->NvContextBeta4); - nouveau_grobj_free(&pNv->NvImagePattern); - nouveau_grobj_free(&pNv->NvRop); - nouveau_grobj_free(&pNv->NvRectangle); - nouveau_grobj_free(&pNv->NvImageBlit); - nouveau_grobj_free(&pNv->NvScaledImage); - nouveau_grobj_free(&pNv->NvClipRectangle); - nouveau_grobj_free(&pNv->NvImageFromCpu); - } else - if (pNv->Architecture < NV_ARCH_C0) - nouveau_grobj_free(&pNv->Nv2D); - - if (pNv->Architecture < NV_ARCH_C0) { - nouveau_grobj_free(&pNv->NvMemFormat); - - nouveau_grobj_free(&pNv->NvSW); - nouveau_grobj_free(&pNv->Nv3D); - } + nouveau_grobj_free(&pNv->NvContextSurfaces); + nouveau_grobj_free(&pNv->NvContextBeta1); + nouveau_grobj_free(&pNv->NvContextBeta4); + nouveau_grobj_free(&pNv->NvImagePattern); + nouveau_grobj_free(&pNv->NvRop); + nouveau_grobj_free(&pNv->NvRectangle); + nouveau_grobj_free(&pNv->NvImageBlit); + nouveau_grobj_free(&pNv->NvScaledImage); + nouveau_grobj_free(&pNv->NvClipRectangle); + nouveau_grobj_free(&pNv->NvImageFromCpu); + nouveau_grobj_free(&pNv->Nv2D); + nouveau_grobj_free(&pNv->NvMemFormat); + nouveau_grobj_free(&pNv->NvSW); + nouveau_grobj_free(&pNv->Nv3D); nouveau_bo_ref(NULL, &pNv->tesla_scratch); nouveau_bo_ref(NULL, &pNv->shader_mem); |