xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/legacy_crtc.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 9bea60b3eb378de5e1d44cc02a2763f4feae7882
Author: Alex Deucher <alex at botch2.com>
Date:   Sat Mar 22 11:46:15 2008 -0400

    RS4xx: more work on disp/disp2 fifo setup

diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c
index 43bf325..d7f8d61 100644
--- a/src/legacy_crtc.c
+++ b/src/legacy_crtc.c
@@ -1564,6 +1564,12 @@ RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_bytes2
 	OUTREG(RS400_DISP1_REQ_CNTL1, (temp |
 				       (critical_point << RS400_DISP1_START_REQ_LEVEL_SHIFT) |
 				       (critical_point << RS400_DISP1_STOP_REQ_LEVEL_SHIFT)));
+	temp = info->SavedReg->dmif_mem_cntl1;
+	temp &= ~(RS400_DISP1_CRITICAL_POINT_START_MASK |
+		  RS400_DISP1_CRITICAL_POINT_STOP_MASK);
+	OUTREG(RS400_DMIF_MEM_CNTL1, (temp |
+				      (critical_point << RS400_DISP1_CRITICAL_POINT_START_SHIFT) |
+				      (critical_point << RS400_DISP1_CRITICAL_POINT_STOP_SHIFT)));
     }
 
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
@@ -1624,6 +1630,12 @@ RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_bytes2
 	    OUTREG(RS400_DISP2_REQ_CNTL1, (temp |
 					   (critical_point2 << RS400_DISP1_START_REQ_LEVEL_SHIFT) |
 					   (critical_point2 << RS400_DISP1_STOP_REQ_LEVEL_SHIFT)));
+	    temp = info->SavedReg->disp2_req_cntl2;
+	    temp &= ~(RS400_DISP2_CRITICAL_POINT_START_MASK |
+		      RS400_DISP2_CRITICAL_POINT_STOP_MASK);
+	    OUTREG(RS400_DISP2_REQ_CNTL2, (temp |
+					   (critical_point2 << RS400_DISP2_CRITICAL_POINT_START_SHIFT) |
+					   (critical_point2 << RS400_DISP2_CRITICAL_POINT_STOP_SHIFT)));
 	}
 
 	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,