diff options
| author | Maarten Maathuis <madman2003@gmail.com> | 2008-02-01 22:41:09 +0100 |
|---|---|---|
| committer | Maarten Maathuis <madman2003@gmail.com> | 2008-02-01 22:41:09 +0100 |
| commit | cedb604ee79cd73a9ec3940c7b056109811ba670 (patch) | |
| tree | d8ee1f3018c34bff52c0e4ece8d5f764e495d653 /src/nv_setup.c | |
| parent | 1a5247856929877442e1ec00f190c6d497ca64fe (diff) | |
Remove usage of "illegal" wrappers in code that also used for randr12 mode.
- I've got something prettier in mind to clean this up, which will likely follow.
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index 181489f..f6a1500 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -510,26 +510,26 @@ NVCommonSetup(ScrnInfoPtr pScrn) pNv->Television = FALSE; if (pNv->twoHeads) { - pNv->vtOWNER = nvReadVGA(pNv, NV_VGA_CRTCX_OWNER); + pNv->vtOWNER = NVReadVGA(pNv, 0, NV_VGA_CRTCX_OWNER); if (pNv->NVArch == 0x11) { /* reading OWNER is broken on nv11 */ if (nvReadMC(pNv, NV_PBUS_DEBUG_1) & (1 << 28)) /* heads tied, restore both */ pNv->vtOWNER = 0x04; else { - nvWriteVGA(pNv, NV_VGA_CRTCX_OWNER, 3); + NVWriteVGA(pNv, 0, NV_VGA_CRTCX_OWNER, 3); NVSelectHeadRegisters(pScrn, 1); NVLockUnlock(pNv, 0); - uint8_t slaved_on_B = nvReadVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80; + uint8_t slaved_on_B = NVReadVGA(pNv, 1, NV_VGA_CRTCX_PIXEL) & 0x80; if (slaved_on_B) - tvB = !(nvReadVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01); + tvB = !(NVReadVGA(pNv, 1, NV_VGA_CRTCX_LCD) & 0x01); - nvWriteVGA(pNv, NV_VGA_CRTCX_OWNER, 0); + NVWriteVGA(pNv, 0, NV_VGA_CRTCX_OWNER, 0); NVSelectHeadRegisters(pScrn, 0); NVLockUnlock(pNv, 0); - uint8_t slaved_on_A = nvReadVGA(pNv, NV_VGA_CRTCX_PIXEL) & 0x80; + uint8_t slaved_on_A = NVReadVGA(pNv, 0, NV_VGA_CRTCX_PIXEL) & 0x80; if (slaved_on_A) - tvA = !(nvReadVGA(pNv, NV_VGA_CRTCX_LCD) & 0x01); + tvA = !(NVReadVGA(pNv, 0, NV_VGA_CRTCX_LCD) & 0x01); if (slaved_on_A && !tvA) pNv->vtOWNER = 0x0; |