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

[Keith Packard]

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

New commits:
commit da510caffc6c69c398669eafeb3cbb12f5c27938
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Sep 15 15:48:00 2009 -0700

    Initialize gen4 render code under XAA too
    
    XAA uses the gen4 render code for RandR transform support and other
    fairly simple render acceleration. Failing to initialize it would
    cause a segfault when it was used.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 0a747c1..238460b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3332,7 +3332,7 @@ I830LeaveVT(int scrnIndex, int flags)
    }
 #endif /* XF86DRI_MM */
 
-   if (pI830->useEXA && IS_I965G(pI830))
+   if (!pI830->noAccel && IS_I965G(pI830))
       gen4_render_state_cleanup(pScrn);
 
    if (pI830->AccelInfoRec)
@@ -3381,7 +3381,7 @@ I830EnterVT(int scrnIndex, int flags)
    /* Update the screen pixmap in case the buffer moved */
    i830_update_front_offset(pScrn);
 
-   if (pI830->useEXA && IS_I965G(pI830))
+   if (!pI830->noAccel && IS_I965G(pI830))
       gen4_render_state_init(pScrn);
 
    if (i830_check_error_state(pScrn)) {