From d499eeaf22f77a1294e99aa38a50aa6810bb684a Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 7 Oct 2009 17:43:11 -0400 Subject: ATOM: reorder crtc dpms based on bios recommendations --- src/atombios_crtc.c | 4 ++-- src/radeon_atombios.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c index d4823da..5d95241 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c @@ -172,18 +172,18 @@ atombios_crtc_dpms(xf86CrtcPtr crtc, int mode) RADEONInfoPtr info = RADEONPTR(crtc->scrn); switch (mode) { case DPMSModeOn: + atombios_enable_crtc(info->atomBIOS, radeon_crtc->crtc_id, 1); if (IS_DCE3_VARIANT) atombios_enable_crtc_memreq(info->atomBIOS, radeon_crtc->crtc_id, 1); - atombios_enable_crtc(info->atomBIOS, radeon_crtc->crtc_id, 1); atombios_blank_crtc(info->atomBIOS, radeon_crtc->crtc_id, 0); break; case DPMSModeStandby: case DPMSModeSuspend: case DPMSModeOff: atombios_blank_crtc(info->atomBIOS, radeon_crtc->crtc_id, 1); - atombios_enable_crtc(info->atomBIOS, radeon_crtc->crtc_id, 0); if (IS_DCE3_VARIANT) atombios_enable_crtc_memreq(info->atomBIOS, radeon_crtc->crtc_id, 0); + atombios_enable_crtc(info->atomBIOS, radeon_crtc->crtc_id, 0); break; } } diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 0384456..d6a8333 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -2146,15 +2146,15 @@ RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_ switch(crev) { case 1: tv_info = atomDataPtr->AnalogTV_Info.AnalogTV_Info; - + if (index > MAX_SUPPORTED_TV_TIMING) return FALSE; - + crtc_timing->usH_Total = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Total); crtc_timing->usH_Disp = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Disp); crtc_timing->usH_SyncStart = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_SyncStart); crtc_timing->usH_SyncWidth = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_SyncWidth); - + crtc_timing->usV_Total = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_Total); crtc_timing->usV_Disp = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_Disp); crtc_timing->usV_SyncStart = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_V_SyncStart); -- cgit v1.2.3