Remove logical context setup.

This should be a noop.  If it wasn't a noop, it means that on pre-g33 chipsets
we were spamming some data into a page of system memory because we used a
virtual instead of a physical address.  It was also supposed to not work when
we submit it from a batchbuffer, as we have been doing for some time now.
This code has existed since about the beginning of the driver's existence,
with no justification.

3 files changed, 0 insertions, 22 deletions

diff --git a/src/i830.h b/src/i830.h
index 80d6d7b6..3381c3c8 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -452,8 +452,6 @@ typedef struct _I830Rec {
    void (*PointerMoved)(int, int, int);
    CreateScreenResourcesProcPtr    CreateScreenResources;
 
-   i830_memory *logical_context;
-
    i830_memory *power_context;
 
 #ifdef XF86DRI
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 90fa5070..16ddc41a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2604,17 +2604,6 @@ IntelEmitInvarientState(ScrnInfoPtr pScrn)
    if (*pI830->last_3d != LAST_3D_OTHER)
       return;
 
-   ctx_addr = pI830->logical_context->offset;
-   assert((pI830->logical_context->offset & 2047) == 0);
-   {
-      BEGIN_BATCH(2);
-      OUT_BATCH(MI_SET_CONTEXT);
-      OUT_BATCH(pI830->logical_context->offset |
-		CTXT_NO_RESTORE |
-		CTXT_PALETTE_SAVE_DISABLE | CTXT_PALETTE_RESTORE_DISABLE);
-      ADVANCE_BATCH();
-   }
-
    if (!IS_I965G(pI830))
    {
       if (IS_I9XX(pI830))
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 2053d06b..fa22782d 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1434,15 +1434,6 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn)
 	pI830->SWCursor = TRUE;
     }
 
-    /* Space for the X Server's 3D context.  32k is fine for right now. */
-    pI830->logical_context = i830_allocate_memory(pScrn, "logical 3D context",
-						  KB(32), GTT_PAGE_SIZE, 0);
-    if (pI830->logical_context == NULL) {
-	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		   "Failed to allocate logical context space.\n");
-	return FALSE;
-    }
-
     if (pI830->memory_manager == NULL) {
 	pI830->fake_bufmgr_mem = i830_allocate_memory(pScrn, "fake bufmgr",
 						      MB(1), GTT_PAGE_SIZE, 0);