diff options
| -rw-r--r-- | man/intel.man | 6 | ||||
| -rw-r--r-- | src/i830.h | 2 | ||||
| -rw-r--r-- | src/i830_driver.c | 20 | ||||
| -rw-r--r-- | src/i830_memory.c | 11 |
4 files changed, 0 insertions, 39 deletions
diff --git a/man/intel.man b/man/intel.man index 5ce31eaa..178ff0a6 100644 --- a/man/intel.man +++ b/man/intel.man @@ -121,12 +121,6 @@ other drivers. Disable or enable XVideo support. Default: XVideo is enabled for configurations where it is supported. .TP -.BI "Option \*qLinearAlloc\*q \*q" integer \*q -Allows more memory for the offscreen allocator. This usually helps in -situations where HDTV movies are required to play but not enough offscreen -memory is usually available. Set this to 8160 for upto 1920x1080 HDTV support. -Default 0KB (off). -.TP .BI "Option \*qLegacy3D\*q \*q" boolean \*q Enable support for the legacy i915_dri.so 3D driver. This will, among other things, make the 2D driver tell libGL to @@ -298,9 +298,7 @@ typedef struct _I830Rec { #ifdef I830_XV /* For Xvideo */ i830_memory *overlay_regs; - i830_memory *xaa_linear; #endif - unsigned long LinearAlloc; XF86ModReqInfo shadowReq; /* to test for later libshadow */ Rotation rotation; void (*PointerMoved)(int, int, int); diff --git a/src/i830_driver.c b/src/i830_driver.c index e3bf330a..2c1e5140 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -274,7 +274,6 @@ typedef enum { OPTION_VIDEO_KEY, OPTION_COLOR_KEY, OPTION_CHECKDEVICES, - OPTION_LINEARALLOC, OPTION_MODEDEBUG, #ifdef XF86DRI_MM OPTION_INTELTEXPOOL, @@ -296,7 +295,6 @@ static OptionInfoRec I830Options[] = { {OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, {OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE}, {OPTION_CHECKDEVICES, "CheckDevices",OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_LINEARALLOC, "LinearAlloc", OPTV_INTEGER, {0}, FALSE}, {OPTION_MODEDEBUG, "ModeDebug", OPTV_BOOLEAN, {0}, FALSE}, #ifdef XF86DRI_MM {OPTION_INTELTEXPOOL,"Legacy3D", OPTV_BOOLEAN, {0}, FALSE}, @@ -1300,13 +1298,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) #endif - pI830->LinearAlloc = 0; - if (xf86GetOptValULong(pI830->Options, OPTION_LINEARALLOC, - &(pI830->LinearAlloc))) { - if (pI830->LinearAlloc < 0) - pI830->LinearAlloc = 0; - } - I830PreInitDDC(pScrn); for (i = 0; i < num_pipe; i++) { i830_crtc_init(pScrn, i); @@ -2544,17 +2535,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to init memory manager\n"); } - - if (pI830->xaa_linear != NULL && - xf86InitFBManagerLinear(pScreen, - pI830->xaa_linear->offset / pI830->cpp, - pI830->xaa_linear->size / pI830->cpp)) - { - xf86DrvMsg(scrnIndex, X_INFO, - "Using %ld bytes of offscreen memory for linear " - "(offset=0x%lx)\n", pI830->xaa_linear->size, - pI830->xaa_linear->offset); - } } else { if (!I830InitFBManager(pScreen, &(pI8301->FbMemBox2))) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, diff --git a/src/i830_memory.c b/src/i830_memory.c index 20b33bca..15d241b2 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -230,7 +230,6 @@ i830_reset_allocations(ScrnInfoPtr pScrn) pI830->exa_offscreen = NULL; pI830->exa_965_state = NULL; pI830->overlay_regs = NULL; - pI830->xaa_linear = NULL; pI830->logical_context = NULL; pI830->back_buffer = NULL; pI830->third_buffer = NULL; @@ -663,16 +662,6 @@ i830_allocate_overlay(ScrnInfoPtr pScrn) } } - if (!pI830->useEXA && pI830->LinearAlloc) { - pI830->xaa_linear = i830_allocate_memory(pScrn, "XAA linear memory", - KB(pI830->LinearAlloc), - GTT_PAGE_SIZE, 0); - if (pI830->xaa_linear == NULL) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Failed to allocate linear buffer space\n"); - } - } - return TRUE; } #endif |