Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i915 XvMC: switch psc to drm_intel_bo 

Like with the sampler state buffer.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Carl Worth <cworth@cworth.org>
This commit is contained in:
Daniel Vetter 2010-03-02 21:53:17 +01:00 committed by Carl Worth
parent b543c355f4
commit d30decae6a
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/xvmc/i915_xvmc.c
View File

@ -103,10 +103,6 @@ static void i915_mc_one_time_context_init(XvMCContext * context)
struct i915_3dstate_pixel_shader_program *pixel_shader_program;
struct i915_3dstate_pixel_shader_constants *pixel_shader_constants;
/* pixel shader contant static state */
pixel_shader_constants =
(struct i915_3dstate_pixel_shader_constants *)pI915XvMC->psc.map;
/* sampler static state */
drm_intel_gem_bo_map_gtt(pI915XvMC->ssb_bo);
sampler_state = pI915XvMC->ssb_bo->virtual;
@ -314,6 +310,10 @@ static void i915_mc_one_time_context_init(XvMCContext * context)
drm_intel_gem_bo_unmap_gtt(pI915XvMC->psp_bo);
/* pixel shader contant static state */
drm_intel_gem_bo_map_gtt(pI915XvMC->psc_bo);
pixel_shader_constants = pI915XvMC->psc_bo->virtual;
memset(pixel_shader_constants, 0, sizeof(*pixel_shader_constants));
pixel_shader_constants->dw0.type = CMD_3D;
pixel_shader_constants->dw0.opcode = OPC_3DSTATE_PIXEL_SHADER_CONSTANTS;
@ -323,11 +323,12 @@ static void i915_mc_one_time_context_init(XvMCContext * context)
pixel_shader_constants->value.y = 0.5;
pixel_shader_constants->value.z = 0.5;
pixel_shader_constants->value.w = 0.5;
drm_intel_gem_bo_unmap_gtt(pI915XvMC->psc_bo);
}
static void i915_mc_one_time_state_emit(XvMCContext * context)
{
uint32_t buffer_address;
i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData;
uint32_t load_state_immediate_1, load_indirect, s3_dword, s6_dword;
int mem_select;
@ -382,11 +383,8 @@ static void i915_mc_one_time_state_emit(XvMCContext * context)
OUT_BATCH(66); /* 4 + 16 + 16 + 31 - 1 */
/* Pixel shader constant buffer */
if (mem_select)
buffer_address = pI915XvMC->psc.offset;
else
buffer_address = pI915XvMC->psc.bus_addr;
OUT_BATCH(STATE_VALID | STATE_FORCE | buffer_address);
OUT_RELOC(pI915XvMC->psc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0,
STATE_VALID | STATE_FORCE);
OUT_BATCH(5); /* 6 - 1 */
ADVANCE_BATCH();
}
@ -871,13 +869,6 @@ static int i915_xvmc_map_buffers(i915XvMCContext * pI915XvMC)
return -1;
}
if (drmMap(xvmc_driver->fd,
pI915XvMC->psc.handle,
pI915XvMC->psc.size,
(drmAddress *) & pI915XvMC->psc.map) != 0) {
return 0;
}
if (drmMap(xvmc_driver->fd,
pI915XvMC->corrdata.handle,
pI915XvMC->corrdata.size,
@ -900,11 +891,6 @@ static void i915_xvmc_unmap_buffers(i915XvMCContext * pI915XvMC)
pI915XvMC->msb.map = NULL;
}
if (pI915XvMC->psc.map) {
drmUnmap(pI915XvMC->psc.map, pI915XvMC->psc.size);
pI915XvMC->psc.map = NULL;
}
if (pI915XvMC->corrdata.map) {
drmUnmap(pI915XvMC->corrdata.map, pI915XvMC->corrdata.size);
pI915XvMC->corrdata.map = NULL;
@ -927,6 +913,13 @@ static int i915_xvmc_alloc_one_time_buffers(i915XvMCContext *pI915XvMC)
if (!pI915XvMC->psp_bo)
return 0;
pI915XvMC->psc_bo = drm_intel_bo_alloc(xvmc_driver->bufmgr,
"psc",
GTT_PAGE_SIZE,
GTT_PAGE_SIZE);
if (!pI915XvMC->psc_bo)
return 0;
return 1;
}
@ -934,6 +927,7 @@ static void i915_xvmc_free_one_time_buffers(i915XvMCContext *pI915XvMC)
{
drm_intel_bo_unreference(pI915XvMC->ssb_bo);
drm_intel_bo_unreference(pI915XvMC->psp_bo);
drm_intel_bo_unreference(pI915XvMC->psc_bo);
}
/*
@ -991,15 +985,11 @@ static Status i915_xvmc_mc_create_context(Display * display,
pI915XvMC->msb.handle = tmpComm->msb.handle;
pI915XvMC->msb.offset = tmpComm->msb.offset;
pI915XvMC->msb.size = tmpComm->msb.size;
pI915XvMC->psc.handle = tmpComm->psc.handle;
pI915XvMC->psc.offset = tmpComm->psc.offset;
pI915XvMC->psc.size = tmpComm->psc.size;
if (pI915XvMC->deviceID == PCI_CHIP_I915_G ||
pI915XvMC->deviceID == PCI_CHIP_I915_GM) {
pI915XvMC->sis.bus_addr = tmpComm->sis.bus_addr;
pI915XvMC->msb.bus_addr = tmpComm->msb.bus_addr;
pI915XvMC->psc.bus_addr = tmpComm->psc.bus_addr;
}
pI915XvMC->corrdata.handle = tmpComm->corrdata.handle;

2
src/xvmc/i915_xvmc.h
View File

@ -69,7 +69,7 @@ typedef struct _i915XvMCContext {
intel_xvmc_drm_map_t msb;
drm_intel_bo *ssb_bo;
drm_intel_bo *psp_bo;
intel_xvmc_drm_map_t psc;
drm_intel_bo *psc_bo;
intel_xvmc_drm_map_t corrdata;
} i915XvMCContext;