xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/legacy_crtc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 38ce8a984f96056b7345bcc06505ba27e0e6d5b4
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 20 14:16:22 2008 +1000

    legacy: use entity MMIO for dpms as this can crossover between zaphod infos

diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c
index 590a445..747bc6e 100644
--- a/src/legacy_crtc.c
+++ b/src/legacy_crtc.c
@@ -638,8 +638,8 @@ legacy_crtc_dpms(xf86CrtcPtr crtc, int mode)
     int mask;
     ScrnInfoPtr pScrn = crtc->scrn;
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
-    RADEONInfoPtr info = RADEONPTR(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;
+    RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn);
+    unsigned char *RADEONMMIO = pRADEONEnt->MMIO;
 
     mask = radeon_crtc->crtc_id ? (RADEON_CRTC2_DISP_DIS | RADEON_CRTC2_VSYNC_DIS | RADEON_CRTC2_HSYNC_DIS | RADEON_CRTC2_DISP_REQ_EN_B) : (RADEON_CRTC_DISPLAY_DIS | RADEON_CRTC_HSYNC_DIS | RADEON_CRTC_VSYNC_DIS);