diff options
| author | Stuart Bennett <sb476@cam.ac.uk> | 2008-10-24 02:49:19 +0100 |
|---|---|---|
| committer | Stuart Bennett <sb476@cam.ac.uk> | 2008-10-27 19:44:31 +0000 |
| commit | 3e1ccff8744d9cabef0cd3901e987deeeb38ec12 (patch) | |
| tree | b1924c3c0b568a88fb9f8952437da44d54407c32 /src/nv_setup.c | |
| parent | 83b541e0a9c454059d0e55a932a2ecdbbf650d60 (diff) | |
Condense crtc locking
We unlock all crtcs whenever the driver is active, and relock them when
returning to VT (which is what we were doing, but in a more complicated manner)
Diffstat (limited to 'src/nv_setup.c')
| -rw-r--r-- | src/nv_setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nv_setup.c b/src/nv_setup.c index a66afb9..b092c32 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -535,7 +535,7 @@ NVCommonSetup(ScrnInfoPtr pScrn) NVSelectHeadRegisters(pScrn, 0); - NVLockUnlock(pScrn, 0); + NVLockVgaCrtcs(pNv, false); NVI2CInit(pScrn); @@ -601,7 +601,6 @@ NVCommonSetup(ScrnInfoPtr pScrn) nvWriteCurVGA(pNv, NV_CIO_CRE_44, 3); NVSelectHeadRegisters(pScrn, 1); - NVLockUnlock(pScrn, 0); slaved_on_B = nvReadCurVGA(pNv, NV_CIO_CRE_PIXEL_INDEX) & 0x80; if(slaved_on_B) { @@ -610,7 +609,6 @@ NVCommonSetup(ScrnInfoPtr pScrn) nvWriteCurVGA(pNv, NV_CIO_CRE_44, 0); NVSelectHeadRegisters(pScrn, 0); - NVLockUnlock(pScrn, 0); slaved_on_A = nvReadCurVGA(pNv, NV_CIO_CRE_PIXEL_INDEX) & 0x80; if(slaved_on_A) { |