diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-13 11:44:50 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2007-05-13 11:44:50 -0400 |
| commit | 0550c37ecc434b8075fb3c367d100ff27625bb64 (patch) | |
| tree | 817e2be29477ac78edac8f9e64de95b8dd8d5124 | |
| parent | 117220527de9fd3158f600645bcfcaf46847f45f (diff) | |
RADEON: don't need to pass pScrn to EnableDisplay()
| -rw-r--r-- | src/radeon.h | 2 | ||||
| -rw-r--r-- | src/radeon_display.c | 9 | ||||
| -rw-r--r-- | src/radeon_driver.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/radeon.h b/src/radeon.h index 4f674ed..8c3b700 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -846,7 +846,7 @@ extern Bool RADEONI2cInit(ScrnInfoPtr pScrn); extern void RADEONSetSyncRangeFromEdid(ScrnInfoPtr pScrn, int flag); extern Bool RADEONSetupConnectors(ScrnInfoPtr pScrn); extern Bool RADEONMapControllers(ScrnInfoPtr pScrn); -extern void RADEONEnableDisplay(ScrnInfoPtr pScrn, xf86OutputPtr pPort, BOOL bEnable); +extern void RADEONEnableDisplay(xf86OutputPtr pPort, BOOL bEnable); extern void RADEONDisableDisplays(ScrnInfoPtr pScrn); extern void RADEONGetPanelInfo(ScrnInfoPtr pScrn); extern void RADEONGetTVDacAdjInfo(xf86OutputPtr output); diff --git a/src/radeon_display.c b/src/radeon_display.c index 897db27..cf1d1fe 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -1370,8 +1370,9 @@ void RADEONDisableDisplays(ScrnInfoPtr pScrn) { } /* This is to be used enable/disable displays dynamically */ -void RADEONEnableDisplay(ScrnInfoPtr pScrn, xf86OutputPtr output, BOOL bEnable) +void RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) { + ScrnInfoPtr pScrn = output->scrn; RADEONInfoPtr info = RADEONPTR(pScrn); RADEONSavePtr save = &info->ModeReg; unsigned char * RADEONMMIO = info->MMIO; @@ -2216,13 +2217,13 @@ radeon_dpms(xf86OutputPtr output, int mode) switch(mode) { case DPMSModeOn: - RADEONEnableDisplay(pScrn, output, TRUE); + RADEONEnableDisplay(output, TRUE); /* RADEONDPMSSetOn(output);*/ break; case DPMSModeOff: case DPMSModeSuspend: case DPMSModeStandby: - RADEONEnableDisplay(pScrn, output, FALSE); + RADEONEnableDisplay(output, FALSE); /*RADEONDPMSSetOff(output);*/ break; } @@ -2314,7 +2315,7 @@ radeon_mode_set(xf86OutputPtr output, DisplayModePtr mode, RADEONRestoreDACRegisters(pScrn, &info->ModeReg); } - RADEONEnableDisplay(pScrn, output, TRUE); + RADEONEnableDisplay(output, TRUE); } static void diff --git a/src/radeon_driver.c b/src/radeon_driver.c index a261d0d..edc59bb 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -4644,7 +4644,7 @@ RADEONEnableOutputs(ScrnInfoPtr pScrn, int crtc_num) for (i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; if (output->crtc == crtc) { - RADEONEnableDisplay(pScrn, output, TRUE); + RADEONEnableDisplay(output, TRUE); } } } |