summaryrefslogtreecommitdiff
path: root/src/i915_hwmc.c
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyu.z.wang@intel.com>2007-10-26 22:40:47 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2007-10-26 22:40:47 +0800
commita470f6b2ca291e305979dd9223885a50dc0b334b (patch)
treec6aa93bb0d303b58955ce9775d3eff0243b56bdb /src/i915_hwmc.c
parentce9802edd25255f6c9c11e512b2ef905384b914d (diff)
try to move some fields to xvmc driver structure
Still a lot of things to move include batch buffer, lock, context, surface resource handling, etc.
Diffstat (limited to 'src/i915_hwmc.c')
-rw-r--r--src/i915_hwmc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index f65a0cfd..6ab00e20 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -386,7 +386,6 @@ static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr pScrn, I915XvMCContextPriv *c
return FALSE;
}
- /* XXX xvmc ttm */
if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Correction Data Buffer",
&(ctxpriv->mcCorrdata), 512 * 1024,
ALIGN_BOTH_ENDS)) {
@@ -530,6 +529,7 @@ static int I915XvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext,
}
contextRec->comm.type = xvmc_driver->flag;
+ contextRec->comm.sarea_size = pDRIInfo->SAREASize;
contextRec->ctxno = i;
contextRec->sis.handle = ctxpriv->sis_handle;
contextRec->sis.offset = ctxpriv->mcStaticIndirectState->offset;
@@ -557,9 +557,7 @@ static int I915XvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext,
contextRec->batchbuffer.handle = ctxpriv->batchbuffer_handle;
contextRec->batchbuffer.offset = ctxpriv->mcBatchBuffer->offset;
contextRec->batchbuffer.size = ctxpriv->mcBatchBuffer->size;
- contextRec->sarea_size = pDRIInfo->SAREASize;
contextRec->sarea_priv_offset = sizeof(XF86DRISAREARec);
- contextRec->screen = pScrn->pScreen->myNum;
contextRec->depth = pScrn->bitsPerPixel;
contextRec->deviceID = pI830DRI->deviceID;