diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-14 18:38:59 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-14 18:38:59 +1100 |
| commit | 6bd4fe42789c38e7e804826715214ce6badcca6a (patch) | |
| tree | 93b527740a6802bcba5477fdac7a57103e4b5d79 | |
| parent | 3949288ed26a91e180b178f4796f2f7e1bdc8ed6 (diff) | |
disable dpms on/off as it was writing regs before we wanted to
| -rw-r--r-- | src/radeon_display.c | 5 | ||||
| -rw-r--r-- | src/radeon_driver.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 15e25ebc..0819e540 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -2813,6 +2813,7 @@ RADEONCrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr pMode) goto done; } +#if 0 /* Disable the outputs and CRTCs before setting the mode. */ for (i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; @@ -2825,6 +2826,7 @@ RADEONCrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr pMode) } crtc->funcs->dpms(crtc, DPMSModeOff); +#endif /* Set up the DPLL and any output state that needs to adjust or depend * on the DPLL. @@ -2836,6 +2838,7 @@ RADEONCrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr pMode) output->funcs->mode_set(output, pMode, adjusted_mode); } +#if 0 /* Now, enable the clocks, plane, pipe, and outputs that we set up. */ crtc->funcs->dpms(crtc, DPMSModeOn); for (i = 0; i < xf86_config->num_output; i++) { @@ -2843,7 +2846,7 @@ RADEONCrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr pMode) if (output->crtc == crtc) output->funcs->dpms(output, DPMSModeOn); } - +#endif crtc->curMode = *pMode; /* XXX free adjustedmode */ diff --git a/src/radeon_driver.c b/src/radeon_driver.c index d23fcd9b..a68b140f 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3222,13 +3222,14 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) */ info->directRenderingEnabled = RADEONPreInitDRI(pScrn); #endif - - xf86CrtcSetSizeRange (pScrn, 320, 200, 2048, 2048); if (!RADEONPreInitVRAM(pScrn)) goto fail; RADEONPreInitColorTiling(pScrn); + xf86CrtcSetSizeRange (pScrn, 320, 200, 3072, 3072) ;//nfo->MaxSurfaceWidth, info->MaxLines); + + RADEONPreInitDDC(pScrn); if (!RADEONPreInitControllers(pScrn, pInt10)) |