[patch] Current patch with the same purpose

5117_all_4.3.0-radeon-dpms-on-dvi-v2.patch (text/plain), 2.41 KB, created by Donnie Berkholz (RETIRED) on 2003-08-11 23:37:29 UTC

Patch by Mike A. Harris <[e-mail]>

The following patch adds DPMS support to the radeon driver for flat panel
displays (DFP) and LCD panels.  It does not affect the CRT codepath, and
has been tested on singlehead CRT systems, dualhead CRT, CRT + DFP, and
dual DFP cards Dell ships.  I've tested it single and dualhead with CRTs
on Radeon 7000/7500/8500/9000/9700 for regressions and had no problems
so far.  Tested with suspend/standby/off signals using "xset dpms force".

Patch update: Version 2 (XFree86-4.3.0-ati-radeon-dpms-on-dvi-v2.patch)

Hui Yu from ATI provided additional information about DVI vs. LCD DPMS
support and indicated the MT_LCD in my original patch was incorrect.  I've
removed that for now, and will work on this some more after XFree86 4.3.0
is officially released.

--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.ati-radeon-dpms-on-dvi	2003-02-21 15:54:52.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	2003-02-21 16:54:50.000000000 -0500
@@ -5864,17 +5864,31 @@
 
     if (info->accelOn) info->accel->Sync(pScrn);
 
+    /* The entire DPMS code seems overly complicated to me, and perhaps
+     * could be rewritten to use DISP_PWR_MAN_DPMS instead of manually twiddling
+     * the CRTCs. This perhaps would enable DPMS to work properly on more hardware
+     * without special casing?  - Mike A. Harris <[e-mail]>
+     */
     if (info->FBDev) {
 	fbdevHWDPMSSet(pScrn, PowerManagementMode, flags);
+    } else if (info->DisplayType == MT_DFP) {
+	switch (PowerManagementMode) {
+	case DPMSModeOn:
+	    OUTREG(RADEON_FP_GEN_CNTL,
+		   INREG(RADEON_FP_GEN_CNTL) | (RADEON_FP_TMDS_EN | RADEON_FP_FPON));
+	    break;
+	case DPMSModeStandby:
+	case DPMSModeSuspend:
+	case DPMSModeOff:
+ 	    OUTREG(RADEON_FP_GEN_CNTL,
+		   INREG(RADEON_FP_GEN_CNTL) & ~(RADEON_FP_TMDS_EN | RADEON_FP_FPON));
+ 	    break;
+	}
     } else {
-	int             mask1     = (RADEON_CRTC_DISPLAY_DIS |
-				     RADEON_CRTC_HSYNC_DIS |
-				     RADEON_CRTC_VSYNC_DIS);
-	int             mask2     = (RADEON_CRTC2_DISP_DIS |
-				     RADEON_CRTC2_VSYNC_DIS |
-				     RADEON_CRTC2_HSYNC_DIS);
-
-	/* TODO: additional handling for LCD ? */
+	int mask1 = (RADEON_CRTC_DISPLAY_DIS | RADEON_CRTC_HSYNC_DIS |
+		     RADEON_CRTC_VSYNC_DIS);
+	int mask2 = (RADEON_CRTC2_DISP_DIS | RADEON_CRTC2_VSYNC_DIS |
+		     RADEON_CRTC2_HSYNC_DIS);
 
 	switch (PowerManagementMode) {
 	case DPMSModeOn: