diff options
| author | Maarten Maathuis <madman2003@gmail.com> | 2008-03-06 19:16:36 +0100 |
|---|---|---|
| committer | Maarten Maathuis <madman2003@gmail.com> | 2008-03-06 19:16:36 +0100 |
| commit | 97ac866a4e433c70d0de7a1e8fb66a3994194ffd (patch) | |
| tree | e58975d314493d8755ee806ebe0cf9d5856a105b /src/nv_setup.c | |
| parent | ea8fba29bcfe8158c9bf17754a20684430027aee (diff) | |
randr12: Kill almost all usage of ErrorF + some misc cleanup.
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 749abf4..d56cc09 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -503,14 +503,14 @@ NVCommonSetup(ScrnInfoPtr pScrn) if (nvReadMC(pNv, NV_PBUS_DEBUG_1) & (1 << 28)) /* heads tied, restore both */ pNv->vtOWNER = 0x04; else { - NVSetOwner(pNv, 1); + NVSetOwner(pScrn, 1); NVLockVgaCrtc(pNv, 1, false); uint8_t slaved_on_B = NVReadVGA(pNv, 1, NV_VGA_CRTCX_PIXEL) & 0x80; if (slaved_on_B) tvB = !(NVReadVGA(pNv, 1, NV_VGA_CRTCX_LCD) & 0x01); - NVSetOwner(pNv, 0); + NVSetOwner(pScrn, 0); NVLockVgaCrtc(pNv, 0, false); uint8_t slaved_on_A = NVReadVGA(pNv, 0, NV_VGA_CRTCX_PIXEL) & 0x80; @@ -530,7 +530,7 @@ NVCommonSetup(ScrnInfoPtr pScrn) } } - ErrorF("Initial CRTC_OWNER is %d\n", pNv->vtOWNER); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initial CRTC_OWNER is %d\n", pNv->vtOWNER); } /* Parse the bios to initialize the card */ |