diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-12-15 19:48:42 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-12-15 19:48:42 +1100 |
| commit | 62a5e7565b66d7b7d65609c034f34b55bd266617 (patch) | |
| tree | 87d1db987e990ac4fbe9d2742a72e33d32f43d70 /src/radeon_modes.c | |
| parent | 29124400c7f193317d41d8cfd748371a239cfea1 (diff) | |
bring over latest code from Intel git repo.
this code doesn't work yet just realigns with intel work
Diffstat (limited to 'src/radeon_modes.c')
| -rw-r--r-- | src/radeon_modes.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/radeon_modes.c b/src/radeon_modes.c index bd11106e..639d39aa 100644 --- a/src/radeon_modes.c +++ b/src/radeon_modes.c @@ -595,14 +595,15 @@ int RADEONValidateMergeModes(ScrnInfoPtr pScrn1) void RADEONProbeOutputModes(ScrnInfoPtr pScrn) { + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn); RADEONInfoPtr info = RADEONPTR(pScrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); int i; DisplayModePtr ddc_modes, mode; DisplayModePtr test; - for (i = 0; i < info->xf86_config.num_output; i++) { - xf86OutputPtr output = info->xf86_config.output[i]; + for (i = 0; i < config->num_output; i++) { + xf86OutputPtr output = config->output[i]; test = output->probed_modes; while(test != NULL) { @@ -705,6 +706,7 @@ RADEONProbeOutputModes(ScrnInfoPtr pScrn) void RADEON_set_xf86_modes_from_outputs(ScrnInfoPtr pScrn) { + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn); RADEONInfoPtr info = RADEONPTR(pScrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); DisplayModePtr saved_mode, last; @@ -727,8 +729,8 @@ RADEON_set_xf86_modes_from_outputs(ScrnInfoPtr pScrn) * pScrn->modes should only be used for XF86VidMode now, which we don't * care about enough to make some sort of unioned list. */ - for (i = 0; i < info->xf86_config.num_output; i++) { - xf86OutputPtr output = info->xf86_config.output[i]; + for (i = 0; i < config->num_output; i++) { + xf86OutputPtr output = config->output[i]; if (output->probed_modes != NULL) { pScrn->modes = RADEONxf86DuplicateModes(pScrn, output->probed_modes); |