diff options
| author | Stuart Bennett <stuart@freedesktop.org> | 2009-03-13 03:52:54 +0000 |
|---|---|---|
| committer | Stuart Bennett <stuart@freedesktop.org> | 2009-03-14 02:18:06 +0000 |
| commit | b21c807d2ced35ac1b06300f6e68d661710b336a (patch) | |
| tree | 77a1b2cbce7b5151ef415ae9b51d5d7b72ef6276 /src/nv_setup.c | |
| parent | 3ea4b194e83735145d5e9d5c5357f92ae6c6a569 (diff) | |
randr12: store nv0x hw cursor image in VRAM
nv_driver.c is already doing the alloc, nvidia uses the same method, and it saves code :)
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index 6ac6058..2a75f4f 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -309,7 +309,6 @@ static void nv4GetConfig (NVPtr pNv) } pNv->CrystalFreqKHz = (nvReadEXTDEV(pNv, NV_PEXTDEV_BOOT_0) & 0x00000040) ? 14318 : 13500; - pNv->CURSOR = &(pNv->PRAMIN[0x5E00]); pNv->MinVClockFreqKHz = 12000; pNv->MaxVClockFreqKHz = 350000; } @@ -359,7 +358,6 @@ static void nv10GetConfig(ScrnInfoPtr pScrn) if (nvReadEXTDEV(pNv, NV_PEXTDEV_BOOT_0) & (1 << 22)) pNv->CrystalFreqKHz = 27000; - pNv->CURSOR = NULL; /* can't set this here */ pNv->MinVClockFreqKHz = 12000; pNv->MaxVClockFreqKHz = pNv->two_reg_pll ? 400000 : 350000; } @@ -417,8 +415,7 @@ NVCommonSetup(ScrnInfoPtr pScrn) pci_device_map_range(pNv->PciInfo, pNv->VRAMPhysical, 0x10000, PCI_DEV_MAP_FLAG_WRITABLE, (void *)&pNv->FB_BAR); #endif /* XSERVER_LIBPCIACCESS */ - pNv->PRAMIN = pNv->REGS + (NV_PRAMIN_OFFSET/4); - pNv->PGRAPH = pNv->REGS + (NV_PGRAPH_OFFSET/4); + //pNv->PGRAPH = pNv->REGS + (NV_PGRAPH_OFFSET/4); /* 8 bit registers */ pNv->PCIO0 = (uint8_t *)pNv->REGS + NV_PRMCIO0_OFFSET; |