diff options
| author | Stuart Bennett <stuart@freedesktop.org> | 2009-03-15 04:08:56 +0000 |
|---|---|---|
| committer | Stuart Bennett <stuart@freedesktop.org> | 2009-03-23 01:32:12 +0000 |
| commit | a9df3049a7e38b3bf4478459e5f0736e10927247 (patch) | |
| tree | 44e074dda5680b5d8dc0a51d61d9f7aaf692f361 /src/nv_setup.c | |
| parent | 2c0710d334e3e1dcb04cc4fc0b46ec4c8cdb9ba6 (diff) | |
pre-nv50: use nvidia's names for PCRTC regs where known
Mostly adding 'P' to the previous NV_CTRC regs -- either when known
correct, or when totally unknown (eg NV_PCRTC_850); made-up names
untouched. Lack of code changes checked with cpp.
Unused defines removed too.
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index 2a75f4f..23f1632 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -612,8 +612,8 @@ NVCommonSetup(ScrnInfoPtr pScrn) tvA = !(nvReadCurVGA(pNv, NV_CIO_CRE_LCD__INDEX) & 0x01); } - oldhead = NVReadCRTC(pNv, 0, NV_CRTC_FSEL); - NVWriteCRTC(pNv, 0, NV_CRTC_FSEL, oldhead | 0x00000010); + oldhead = NVReadCRTC(pNv, 0, NV_PCRTC_ENGINE_CTRL); + NVWriteCRTC(pNv, 0, NV_PCRTC_ENGINE_CTRL, oldhead | 0x00000010); monitorA = NVProbeDDC(pScrn, 0); monitorB = NVProbeDDC(pScrn, 1); @@ -726,7 +726,7 @@ NVCommonSetup(ScrnInfoPtr pScrn) if(implementation == CHIPSET_NV11) cr44 = pNv->crtc_active[1] * 0x3; - NVWriteCRTC(pNv, 0, NV_CRTC_FSEL, oldhead); + NVWriteCRTC(pNv, 0, NV_PCRTC_ENGINE_CTRL, oldhead); nvWriteCurVGA(pNv, NV_CIO_CRE_44, cr44); NVSelectHeadRegisters(pScrn, pNv->crtc_active[1]); |