diff options
| author | darktama_ <darktama_> | 2006-07-31 03:24:17 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-08-25 19:03:35 +1000 |
| commit | 9a314361fd004afe7129ae2d41f58ddd7fe6f56a (patch) | |
| tree | 54f69711b1889bb96f772b0e6d6092f1f892bb85 /src/nv_hw.c | |
| parent | 11fbb14876e7873a863de16b01fb5778e841b4bd (diff) | |
| download | xorg-driver-xf86-video-nouveau-9a314361fd004afe7129ae2d41f58ddd7fe6f56a.tar.gz | |
Updates for DRM changes, and a few cleanups
Diffstat (limited to 'src/nv_hw.c')
| -rw-r--r-- | src/nv_hw.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/nv_hw.c b/src/nv_hw.c index cd66caa..64b8113 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -931,12 +931,14 @@ void NVLoadStateExt ( NVPtr pNv = NVPTR(pScrn); int i, j; - pNv->PMC[0x0140/4] = 0x00000000; + if (!pNv->IRQ) + pNv->PMC[0x0140/4] = 0x00000000; pNv->PMC[0x0200/4] = 0xFFFF00FF; pNv->PMC[0x0200/4] = 0xFFFFFFFF; pNv->PTIMER[0x0200] = 0x00000008; pNv->PTIMER[0x0210] = 0x00000003; + /*TODO: DRM handle PTIMER interrupts */ pNv->PTIMER[0x0140] = 0x00000000; pNv->PTIMER[0x0100] = 0xFFFFFFFF; @@ -989,8 +991,10 @@ void NVLoadStateExt ( pNv->PGRAPH[0x008C/4] = 0x0004FF31; pNv->PGRAPH[0x008C/4] = 0x4004FF31; - pNv->PGRAPH[0x0140/4] = 0x00000000; - pNv->PGRAPH[0x0100/4] = 0xFFFFFFFF; + if (!pNv->IRQ) { + pNv->PGRAPH[0x0140/4] = 0x00000000; + pNv->PGRAPH[0x0100/4] = 0xFFFFFFFF; + } pNv->PGRAPH[0x0170/4] = 0x10010100; pNv->PGRAPH[0x0710/4] = 0xFFFFFFFF; pNv->PGRAPH[0x0720/4] = 0x00000001; @@ -1001,8 +1005,10 @@ void NVLoadStateExt ( pNv->PGRAPH[0x0080/4] = 0xFFFFFFFF; pNv->PGRAPH[0x0080/4] = 0x00000000; - pNv->PGRAPH[0x0140/4] = 0x00000000; - pNv->PGRAPH[0x0100/4] = 0xFFFFFFFF; + if (!pNv->IRQ) { + pNv->PGRAPH[0x0140/4] = 0x00000000; + pNv->PGRAPH[0x0100/4] = 0xFFFFFFFF; + } pNv->PGRAPH[0x0144/4] = 0x10010100; pNv->PGRAPH[0x0714/4] = 0xFFFFFFFF; pNv->PGRAPH[0x0720/4] = 0x00000001; @@ -1092,7 +1098,6 @@ void NVLoadStateExt ( pNv->PGRAPH[0x0b38/4] = 0x2ffff800; pNv->PGRAPH[0x0b3c/4] = 0x00006000; pNv->PGRAPH[0x032C/4] = 0x01000000; - pNv->PGRAPH[0x0220/4] = 0x00001200; } else if(pNv->Architecture == NV_ARCH_30) { pNv->PGRAPH[0x0084/4] = 0x40108700; |