From 188d58dac9a87b56dbc34ec219cd196928bbcf64 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Tue, 16 Sep 2008 11:49:39 -0700
Subject: [PATCH] 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
---
 src/i830_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);