summaryrefslogtreecommitdiff
path: root/src/legacy
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-18 22:19:45 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-07-18 22:21:22 +0100
commit4bcab83bbddf8a698aa83f5038f9ab019a404bd5 (patch)
tree085d161f367ddd0550dd5a97419e5597210bf2e4 /src/legacy
parent558c8251299b786cab1ac83dbd35f077224b5950 (diff)
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@chris-wilson.co.uk>
Diffstat (limited to 'src/legacy')
-rw-r--r--src/legacy/i810/i810_dri.c2
-rw-r--r--src/legacy/i810/i810_driver.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/legacy/i810/i810_dri.c b/src/legacy/i810/i810_dri.c
index f2643f54..3bdb2ceb 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 98216121..bd80077b 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;