diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-07-10 22:31:13 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 09:46:14 -0400 |
| commit | a6561f2ec673b38907f7181235386f32e60c32ba (patch) | |
| tree | aa3a85089159e5079a0eee0ac437485415b51b34 /src/legacy_crtc.c | |
| parent | 75ef8dc214715d3c5c50996b293933842903ba65 (diff) | |
Move DRI to a separate struct
based on Matthias' similar work in rhd
Diffstat (limited to 'src/legacy_crtc.c')
| -rw-r--r-- | src/legacy_crtc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c index 8995679f..14e4259b 100644 --- a/src/legacy_crtc.c +++ b/src/legacy_crtc.c @@ -631,7 +631,7 @@ radeon_crtc_modeset_ioctl(xf86CrtcPtr crtc, Bool post) modeset.crtc = radeon_crtc->crtc_id; modeset.cmd = post ? _DRM_POST_MODESET : _DRM_PRE_MODESET; - ioctl(info->drmFD, DRM_IOCTL_MODESET_CTL, &modeset); + ioctl(info->dri->drmFD, DRM_IOCTL_MODESET_CTL, &modeset); #endif } @@ -761,7 +761,7 @@ RADEONInitCrtcBase(xf86CrtcPtr crtc, RADEONSavePtr save, save->crtc_offset = pScrn->fbOffset; #ifdef XF86DRI - if (info->allowPageFlip) + if (info->dri && info->dri->allowPageFlip) save->crtc_offset_cntl = RADEON_CRTC_OFFSET_FLIP_CNTL; else #endif @@ -854,7 +854,7 @@ RADEONInitCrtcBase(xf86CrtcPtr crtc, RADEONSavePtr save, pSAREA->frame.height = pScrn->frameY1 - y + 1; if (pSAREAPriv->pfCurrentPage == 1) { - Base += info->backOffset - info->frontOffset; + Base += info->dri->backOffset - info->dri->frontOffset; } } #endif @@ -981,7 +981,7 @@ RADEONInitCrtc2Base(xf86CrtcPtr crtc, RADEONSavePtr save, */ save->crtc2_offset = pScrn->fbOffset; #ifdef XF86DRI - if (info->allowPageFlip) + if (info->dri && info->dri->allowPageFlip) save->crtc2_offset_cntl = RADEON_CRTC_OFFSET_FLIP_CNTL; else #endif @@ -1068,7 +1068,7 @@ RADEONInitCrtc2Base(xf86CrtcPtr crtc, RADEONSavePtr save, pSAREAPriv->crtc2_base = Base; if (pSAREAPriv->pfCurrentPage == 1) { - Base += info->backOffset - info->frontOffset; + Base += info->dri->backOffset - info->dri->frontOffset; } } #endif @@ -1460,7 +1460,7 @@ RADEONInitDispBandwidthLegacy(ScrnInfoPtr pScrn, } else { #ifdef XF86DRI if (info->directRenderingEnabled) - sclk_eff = info->sclk - (info->agpMode * 50.0 / 3.0); + sclk_eff = info->sclk - (info->dri->agpMode * 50.0 / 3.0); else #endif sclk_eff = info->sclk; |