xf86-video-intel: src/legacy/i810

[Chris Wilson]

 src/legacy/i810/i810_dri.c    |    2 ++
 src/legacy/i810/i810_driver.c |    6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 4bcab83bbddf8a698aa83f5038f9ab019a404bd5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 18 22:19:45 2012 +0100

    i810: DRI is not dependent upon XAA
    
    The blit routines is uses are independent of the XAA driver interface
    and can be used separately.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/legacy/i810/i810_dri.c b/src/legacy/i810/i810_dri.c
index f2643f5..3bdb2ce 100644
--- a/src/legacy/i810/i810_dri.c
+++ b/src/legacy/i810/i810_dri.c
@@ -1424,5 +1424,7 @@ I810DRIEnter(ScrnInfoPtr pScrn)
 			pI810->CursorARGBStart) != 0)
 	    return FALSE;
    }
+
+   I810SelectBuffer(pScrn, I810_SELECT_FRONT);
    return TRUE;
 }
diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
index 9821612..bd80077 100644
--- a/src/legacy/i810/i810_driver.c
+++ b/src/legacy/i810/i810_driver.c
@@ -355,11 +355,7 @@ I810PreInit(ScrnInfoPtr scrn, int flags)
      !xf86ReturnOptValBool(pI810->Options, OPTION_DRI, TRUE);
 
    if (!pI810->directRenderingDisabled) {
-     if (pI810->noAccel) {
-       xf86DrvMsg(scrn->scrnIndex, X_WARNING, "DRI is disabled because it "
-		  "needs 2D acceleration.\n");
-       pI810->directRenderingDisabled=TRUE;
-     } else if (scrn->depth!=16) {
+     if (scrn->depth!=16) {
        xf86DrvMsg(scrn->scrnIndex, X_WARNING, "DRI is disabled because it "
 		  "runs only at 16-bit depth.\n");
        pI810->directRenderingDisabled=TRUE;