xf86-video-intel: Branch 'drm-gem' - src/i830_driver.c src/i830_memory.c

[Eric Anholt]

 src/i830_driver.c |    2 +-
 src/i830_memory.c |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 286ff63f83db8ea16514512385e6f8c6875871ef
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jul 17 17:06:28 2008 -0700

    Don't set up the HWS page in GEM mode now that the kernel manages it.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 03861a9..dcbaa04 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3477,7 +3477,7 @@ I830EnterVT(int scrnIndex, int flags)
 	* operation which accessing that page, like irq install, etc.
 	*/
        if (pI830->starting) {
-	   if (HWS_NEED_GFX(pI830) && !I830DRISetHWS(pScrn)) {
+	   if (pI830->hw_status != NULL && !I830DRISetHWS(pScrn)) {
 		   xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 			   "Fail to setup hardware status page.\n");
 		   I830DRICloseScreen(pScrn->pScreen);
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 08a2201..222882c 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -462,10 +462,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 	/* Can't do GEM on stolen memory */
 	mmsize -= pI830->stolen_size;
 
-	/* new chipsets need non-stolen status page */
-	if (HWS_NEED_GFX(pI830) && HWS_NEED_NONSTOLEN(pI830))
-	    mmsize -= HWSTATUS_PAGE_SIZE;
-
 	/* Create the aperture allocation */
 	pI830->memory_manager =
 	    i830_allocate_aperture(pScrn, "DRI memory manager",
@@ -1717,7 +1713,7 @@ i830_allocate_3d_memory(ScrnInfoPtr pScrn)
 
     DPRINTF(PFX, "i830_allocate_3d_memory\n");
 
-    if (HWS_NEED_GFX(pI830)) {
+    if (!pI830->memory_manager && HWS_NEED_GFX(pI830)) {
 	if (!i830_allocate_hwstatus(pScrn))
 	    return FALSE;
     }