xf86-video-intel: Branch 'intel-batchbuffer' - src/i830_driver.c

[Kristian Høgsberg]

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

New commits:
commit 86045b7fb2d10eec6540deab9de5f35dd3474d6f
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Mon Feb 25 23:06:37 2008 -0500

    Fix botched merge: set the HWS correctly when using DRI2.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 48d7e01..cd9b6e4 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3222,10 +3222,8 @@ I830EnterVT(int scrnIndex, int flags)
 
       if (pI830->starting) {
 	 if (HWS_NEED_GFX(pI830) && !I830DRISetHWS(pScrn)) {
-	    if (!I830SetHWS(pScrn, pI830->hw_status->offset)) {
-	       pI830->directRendering = DRI_TYPE_NONE;
-	       return FALSE;
-	    }
+	     pI830->directRendering = DRI_TYPE_NONE;
+	     return FALSE;
 	 }
 
 	 if (!I830DRIInstIrqHandler(pScrn)) {