summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-10-07 17:43:11 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-10-07 19:58:46 -0400
commitd499eeaf22f77a1294e99aa38a50aa6810bb684a (patch)
tree71236faf134097a842831b38ecc93b7d10a65a2c
parent4ccd2a21f9c50515b4246f35454f76ef49006c76 (diff)
ATOM: reorder crtc dpms based on bios recommendations
-rw-r--r--src/atombios_crtc.c4
-rw-r--r--src/radeon_atombios.c6
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);