diff options
| author | Xiang Hai hao <haihao.xiang@intel.com> | 2009-05-18 17:12:30 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2009-05-18 17:12:30 +0800 |
| commit | b622860429e00d6ab4407980232659c283a8fe8d (patch) | |
| tree | 21892df1406bfc1b9cfc3f0d8ea2e74e9927c367 /src/i915_hwmc.c | |
| parent | 50c10ededba15dd0c118f1b65756362061491090 (diff) | |
DRI2 for XvMC
Diffstat (limited to 'src/i915_hwmc.c')
| -rw-r--r-- | src/i915_hwmc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c index 659638e1..0723c801 100644 --- a/src/i915_hwmc.c +++ b/src/i915_hwmc.c @@ -416,8 +416,6 @@ static int i915_xvmc_create_context (ScrnInfoPtr pScrn, XvMCContextPtr pContext, int *num_priv, long **priv ) { I830Ptr pI830 = I830PTR(pScrn); - DRIInfoPtr pDRIInfo = pI830->pDRIInfo; - I830DRIPtr pI830DRI = pDRIInfo->devPrivate; I915XvMCCreateContextRec *contextRec = NULL; I915XvMCPtr pXvMC = (I915XvMCPtr)xvmc_driver->devPrivate; I915XvMCContextPriv *ctxpriv = NULL; @@ -490,7 +488,6 @@ static int i915_xvmc_create_context (ScrnInfoPtr pScrn, XvMCContextPtr pContext, /* common context items */ contextRec->comm.type = xvmc_driver->flag; - contextRec->comm.sarea_size = pDRIInfo->SAREASize; contextRec->comm.batchbuffer.offset = xvmc_driver->batch->offset; contextRec->comm.batchbuffer.size = xvmc_driver->batch->size; contextRec->comm.batchbuffer.handle = xvmc_driver->batch_handle; @@ -515,8 +512,7 @@ static int i915_xvmc_create_context (ScrnInfoPtr pScrn, XvMCContextPtr pContext, contextRec->corrdata.handle = ctxpriv->corrdata_handle; contextRec->corrdata.offset = ctxpriv->mcCorrdata->offset; contextRec->corrdata.size = ctxpriv->mcCorrdata->size; - contextRec->sarea_priv_offset = sizeof(XF86DRISAREARec); - contextRec->deviceID = pI830DRI->deviceID; + contextRec->deviceID = DEVICE_ID(pI830->PciInfo); if (IS_I915G(pI830) || IS_I915GM(pI830)) { contextRec->sis.bus_addr = ctxpriv->mcStaticIndirectState->bus_addr; |