diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-13 22:29:57 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-13 22:29:57 -0700 |
| commit | f1cda5eaba9cbbfeb913d249d014586a6e8fd7a6 (patch) | |
| tree | a3c57764e7a3a3ea380a78432b16d32c5df5ae6f /src/g80_display.c | |
| parent | 550af781bd9f7cb7256b298281c2c27febfc4722 (diff) | |
G80: Get DPMS working with RandR 1.2.
Work around xf86DisableUnusedFunctions lameness by forcing DPMSModeOn at modeset
time.
Diffstat (limited to 'src/g80_display.c')
| -rw-r--r-- | src/g80_display.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/g80_display.c b/src/g80_display.c index a5a1bc8..d7f52dd 100644 --- a/src/g80_display.c +++ b/src/g80_display.c @@ -36,9 +36,6 @@ #include "g80_display.h" #include "g80_output.h" -#define DPMS_SERVER -#include <X11/extensions/dpms.h> - typedef struct G80CrtcPrivRec { Head head; int pclk; /* Target pixel clock in kHz */ @@ -423,55 +420,6 @@ G80CrtcBlankScreen(xf86CrtcPtr crtc, Bool blank) void G80CrtcDPMSSet(xf86CrtcPtr crtc, int mode) { - ErrorF("CRTC dpms unimplemented\n"); -#if 0 - G80Ptr pNv = G80PTR(pScrn); - const int off = 0x800 * pNv->or; - CARD32 tmp; - - /* - * DPMSModeOn everything on - * DPMSModeStandby hsync disabled, vsync enabled - * DPMSModeSuspend hsync enabled, vsync disabled - * DPMSModeOff sync disabled - */ - switch(pNv->orType) { - case DAC: - while(pNv->reg[(0x0061A004+off)/4] & 0x80000000); - - tmp = pNv->reg[(0x0061A004+off)/4]; - tmp &= ~0x7f; - tmp |= 0x80000000; - - if(mode == DPMSModeStandby || mode == DPMSModeOff) - tmp |= 1; - if(mode == DPMSModeSuspend || mode == DPMSModeOff) - tmp |= 4; - if(mode != DPMSModeOn) - tmp |= 0x10; - if(mode == DPMSModeOff) - tmp |= 0x40; - - pNv->reg[(0x0061A004+off)/4] = tmp; - - break; - - case SOR: - while(pNv->reg[(0x0061C004+off)/4] & 0x80000000); - - tmp = pNv->reg[(0x0061C004+off)/4]; - tmp |= 0x80000000; - - if(mode == DPMSModeOn) - tmp |= 1; - else - tmp &= ~1; - - pNv->reg[(0x0061C004+off)/4] = tmp; - - break; - } -#endif } /******************************** Cursor stuff ********************************/ |