diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-08-08 12:28:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-08-08 12:28:20 +1000 |
| commit | 096a2a556016c609ad0200ea4592ceb42a347a1d (patch) | |
| tree | ecdac17a96f9dcdae0d05d241c1865bf5a14b975 /src/nv_dri.c | |
| parent | 94da101b675916aeaf751df28bea4af67b2bb175 (diff) | |
| parent | 9cb4c95a4fbf38fcb8249e765ff71b2e24912244 (diff) | |
| download | xorg-driver-xf86-video-nouveau-randr-1.2.tar.gz | |
Merge branch 'upstream-master' into upstream-randr-1.2randr-1.2
Conflicts:
src/nv_dma.c
src/nv_dma.h
src/nv_exa.c
Diffstat (limited to 'src/nv_dri.c')
| -rw-r--r-- | src/nv_dri.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/nv_dri.c b/src/nv_dri.c index c854950..0640287 100644 --- a/src/nv_dri.c +++ b/src/nv_dri.c @@ -244,7 +244,7 @@ Bool NVDRIGetVersion(ScrnInfoPtr pScrn) } /* temporary lock step versioning */ -#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 9 +#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 10 #error nouveau_drm.h doesn't match expected patchlevel, update libdrm. #endif if (pNv->pKernelDRMVersion->version_patchlevel != @@ -278,7 +278,6 @@ Bool NVDRIScreenInit(ScrnInfoPtr pScrn) ScreenPtr pScreen; pScreen = screenInfo.screens[pScrn->scrnIndex]; int drm_page_size; - int irq; if (!NVDRICheckModules(pScrn)) return FALSE; @@ -352,24 +351,6 @@ Bool NVDRIScreenInit(ScrnInfoPtr pScrn) return FALSE; } -#if 0 - pNv->IRQ = 0; -#else - /* Ask DRM to install IRQ handler */ - irq = drmGetInterruptFromBusID(pNv->drm_fd, - ((pciConfigPtr)pNv->PciInfo->thisCard)->busnum, - ((pciConfigPtr)pNv->PciInfo->thisCard)->devnum, - ((pciConfigPtr)pNv->PciInfo->thisCard)->funcnum); - - if (drmCtlInstHandler(pNv->drm_fd, irq)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to install IRQ handler\n"); - pNv->IRQ = 0; - } else { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "IRQ handler initialised. IRQ %d\n", irq); - pNv->IRQ = irq; - } -#endif - return TRUE; } |