From 88558ebeed12d6cefd73bba0ddac3c043861ac89 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Fri, 12 May 2006 15:00:17 -0700
Subject: Start fixing up the build and remove a regression from master (I
 think) in rotation.

---
 src/i830_rotate.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/i830_rotate.c')

diff --git a/src/i830_rotate.c b/src/i830_rotate.c
index 9c91cc40..1f1d7291 100644
--- a/src/i830_rotate.c
+++ b/src/i830_rotate.c
@@ -680,10 +680,13 @@ I830Rotate(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	 0
    };
 
-   if (IS_I9XX(pI830))
-      func = I915UpdateRotate;
+   if (pI830->noAccel)
+      func = LoaderSymbol("shadowUpdateRotatePacked");
    else
-      func = I830UpdateRotate;
+      if (IS_I9XX(pI830))
+	 func = I915UpdateRotate;
+      else
+	 func = I830UpdateRotate;
 
    if (I830IsPrimary(pScrn)) {
       pI8301 = pI830;
-- 
cgit v1.2.3