diff options
| author | Eric Anholt <eric@anholt.net> | 2008-12-04 15:18:08 -0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-12-05 15:41:52 +0800 |
| commit | 93485f521b330e98d40b181139a54a5cd00e2b91 (patch) | |
| tree | a08e77022df46097f6929b71f9d4ec28c6738851 | |
| parent | 0972c5eeb5c2f2a31c92296b6de009adba1f861f (diff) | |
Remove the extra memory allocation for 965 video state now that it's all in BOs.
(cherry picked from commit caecd6031e416705b1f0a7051535211feaebdedd)
| -rw-r--r-- | src/i830_video.c | 11 | ||||
| -rw-r--r-- | src/i830_video.h | 6 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index a4830319..87fa0207 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2223,7 +2223,7 @@ I830PutImage(ScrnInfoPtr pScrn, int top, left, npixels, nlines, size; BoxRec dstBox; int pitchAlignMask; - int alloc_size, extraLinear; + int alloc_size; xf86CrtcPtr crtc; if (pPriv->textured) @@ -2370,15 +2370,9 @@ I830PutImage(ScrnInfoPtr pScrn, ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, dstPitch, size); #endif - if (IS_I965G(pI830)) - extraLinear = BRW_LINEAR_EXTRA; - else - extraLinear = 0; - alloc_size = size; if (pPriv->doubleBuffer) alloc_size *= 2; - alloc_size += extraLinear; if (pPriv->buf) { /* Wait for any previous acceleration to the buffer to have completed. @@ -2402,9 +2396,6 @@ I830PutImage(ScrnInfoPtr pScrn, if (pPriv->buf == NULL) return BadAlloc; - pPriv->extra_offset = pPriv->buf->offset + - (pPriv->doubleBuffer ? size * 2 : size); - /* fixup pointers */ #ifdef INTEL_XVMC if (id == FOURCC_XVMC && IS_I915(pI830)) { diff --git a/src/i830_video.h b/src/i830_video.h index 8545fb89..3c2fa4c5 100644 --- a/src/i830_video.h +++ b/src/i830_video.h @@ -59,7 +59,6 @@ typedef struct { Time offTime; Time freeTime; i830_memory *buf; /** YUV data buffer */ - unsigned int extra_offset; Bool overlayOK; int oneLineMode; @@ -71,11 +70,6 @@ typedef struct { #define GET_PORT_PRIVATE(pScrn) \ (I830PortPrivPtr)((I830PTR(pScrn))->adaptor->pPortPrivates[0].ptr) -/* - * Broadwater requires a bit of extra video memory for state information - */ -#define BRW_LINEAR_EXTRA (36*1024) - void I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, int video_pitch2, |