summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyu.z.wang@intel.com>2008-07-22 15:29:34 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-07-22 15:40:44 +0800
commitb9250913ab57ecade1c3011415c666e8516fce47 (patch)
treeb99ca5b7ba980e28a20299d291bbb658a6bbcbbb
parent0403234dd1cdf4aa02709c1fbd815f002e1ace63 (diff)
Bug #16801: fix X crash when NoAccel on 965
(cherry picked from commit fd060ce89d86f6e8ff742d5b287abe8ecea32927)
-rw-r--r--src/i830_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 5a06079a..4bb9b81f 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3307,7 +3307,7 @@ I830LeaveVT(int scrnIndex, int flags)
}
#endif /* XF86DRI_MM */
- if (IS_I965G(pI830))
+ if (pI830->useEXA && IS_I965G(pI830))
gen4_render_state_cleanup(pScrn);
if (pI830->AccelInfoRec)
@@ -3356,7 +3356,7 @@ I830EnterVT(int scrnIndex, int flags)
/* Update the screen pixmap in case the buffer moved */
i830_update_front_offset(pScrn);
- if (IS_I965G(pI830))
+ if (pI830->useEXA && IS_I965G(pI830))
gen4_render_state_init(pScrn);
if (i830_check_error_state(pScrn)) {