diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2008-09-16 11:49:39 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-09-16 21:29:59 -0700 |
| commit | 0a2d17f7c2ea9b695df1855aab4ccc519546d8e5 (patch) | |
| tree | 734504bdca4057dfd34dadc48af6374ffebd12b2 | |
| parent | 95b3e3a65a60aa264fbbfd141df980b534005264 (diff) | |
Put back check for pI830->hw_status in setting hws in non-GEM mode.
Fixes crashes on non-GEM systems with physical hardware status page.
Bug #17540
(cherry picked from commit 188d58dac9a87b56dbc34ec219cd196928bbcf64)
| -rw-r--r-- | src/i830_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index e48e20ec..5e505cf2 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3693,7 +3693,7 @@ I830EnterVT(int scrnIndex, int flags) * operation which accessing that page, like irq install, etc. */ if (pI830->starting && !pI830->memory_manager) { - if (!I830DRISetHWS(pScrn)) { + if (pI830->hw_status != NULL && !I830DRISetHWS(pScrn)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Fail to setup hardware status page.\n"); I830DRICloseScreen(pScrn->pScreen); |