xf86-video-ati: Branch 'randr-1.2' - 2 commits

[Alex Deucher]

 src/radeon_crtc.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

New commits:
diff-tree 7b3e22e96cfc98621bd20fa76317e6d8f7242165 (from 2a35ccfb8ffee9f0ef6f8d4f0eeb80a471543caa)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Thu Jul 5 20:37:10 2007 -0400

    RADEON: set default values for crtc_offset_cntls

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 578da56..de060fb 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -185,8 +185,9 @@ RADEONInitCrtcBase(xf86CrtcPtr crtc, RAD
 #ifdef XF86DRI
     if (info->allowPageFlip)
 	save->crtc_offset_cntl = RADEON_CRTC_OFFSET_FLIP_CNTL;
+    else
 #endif
-
+	save->crtc_offset_cntl = 0;
 
     if (info->tilingEnabled) {
        if (IS_R300_VARIANT)
@@ -415,7 +416,9 @@ RADEONInitCrtc2Base(xf86CrtcPtr crtc, RA
 #ifdef XF86DRI
     if (info->allowPageFlip)
 	save->crtc2_offset_cntl = RADEON_CRTC_OFFSET_FLIP_CNTL;
+    else
 #endif
+	save->crtc2_offset_cntl = 0;
 
     if (info->tilingEnabled) {
        if (IS_R300_VARIANT)
diff-tree 2a35ccfb8ffee9f0ef6f8d4f0eeb80a471543caa (from bdcae622100c81a4d9a53938542b64908bacd195)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Thu Jul 5 20:04:04 2007 -0400

    RADEON: Fix tiling on r1xx and r2xx
    
    spotted by Andrew Randrianasulu <randrik at mail.ru>
    fixes bug 11357

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index e1196b3..578da56 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -175,7 +175,6 @@ RADEONInitCrtcBase(xf86CrtcPtr crtc, RAD
 {
     ScrnInfoPtr pScrn = crtc->scrn;
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;
     int    Base;
 #ifdef XF86DRI
     RADEONSAREAPrivPtr pSAREAPriv;
@@ -223,7 +222,7 @@ RADEONInitCrtcBase(xf86CrtcPtr crtc, RAD
 		pick up the new offset value at the end of each scanline, but the new offset_cntl value
 		only after a vsync. We'd probably need to wait (in drm) for vsync and only then update
 		OFFSET and OFFSET_CNTL, if the y coord has changed. Seems hard to fix. */
-	     save->crtc_offset_cntl = INREG(RADEON_CRTC_OFFSET_CNTL) & ~0xf;
+	     /*save->crtc_offset_cntl = INREG(RADEON_CRTC_OFFSET_CNTL) & ~0xf;*/
 #if 0
 	     /* try to get rid of flickering when scrolling at least for 2d */
 #ifdef XF86DRI
@@ -404,7 +403,6 @@ RADEONInitCrtc2Base(xf86CrtcPtr crtc, RA
 {
     ScrnInfoPtr pScrn = crtc->scrn;
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;
     int    Base;
 #ifdef XF86DRI
     RADEONSAREAPrivPtr pSAREAPriv;
@@ -453,7 +451,7 @@ RADEONInitCrtc2Base(xf86CrtcPtr crtc, RA
 		pick up the new offset value at the end of each scanline, but the new offset_cntl value
 		only after a vsync. We'd probably need to wait (in drm) for vsync and only then update
 		OFFSET and OFFSET_CNTL, if the y coord has changed. Seems hard to fix. */
-	     save->crtc2_offset_cntl = INREG(RADEON_CRTC2_OFFSET_CNTL) & ~0xf;
+	     /*save->crtc2_offset_cntl = INREG(RADEON_CRTC2_OFFSET_CNTL) & ~0xf;*/
 #if 0
 	     /* try to get rid of flickering when scrolling at least for 2d */
 #ifdef XF86DRI