diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2009-02-19 16:41:49 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2009-02-20 11:25:22 -0500 |
| commit | e97e2571703e3d6188bf18f211b793fc50383f9c (patch) | |
| tree | 5d0e8c3eb5f7b87039a4c0621eadcc3d65d6b62e /src/i915_video.c | |
| parent | 96da26b6813a8c1da8a43036c375aa0d2bb70f16 (diff) | |
Fix i915 textured video to work with the i830_memory -> bo change.
Forgot to update i915_video.c in 872aadc7102bd5131e1582ede081e22672911ba2.
Diffstat (limited to 'src/i915_video.c')
| -rw-r--r-- | src/i915_video.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/i915_video.c b/src/i915_video.c index b903b5ec..81a0f874 100644 --- a/src/i915_video.c +++ b/src/i915_video.c @@ -161,7 +161,8 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, OUT_BATCH(_3DSTATE_MAP_STATE | 3); OUT_BATCH(0x00000001); /* texture map #1 */ - OUT_BATCH(pPriv->YBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBuf0offset); + ms3 = MAPSURF_422 | MS3_USE_FENCE_REGS; switch (id) { case FOURCC_YUY2: @@ -269,7 +270,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, OUT_BATCH(_3DSTATE_MAP_STATE | 9); OUT_BATCH(0x00000007); - OUT_BATCH(pPriv->YBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBuf0offset); ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS; ms3 |= (height - 1) << MS3_HEIGHT_SHIFT; ms3 |= (width - 1) << MS3_WIDTH_SHIFT; @@ -282,14 +283,14 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, else OUT_BATCH(((video_pitch * 2 / 4) - 1) << MS4_PITCH_SHIFT); - OUT_BATCH(pPriv->UBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->UBuf0offset); ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS; ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT; ms3 |= (width / 2 - 1) << MS3_WIDTH_SHIFT; OUT_BATCH(ms3); OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT); - OUT_BATCH(pPriv->VBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->VBuf0offset); ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS; ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT; ms3 |= (width / 2 - 1) << MS3_WIDTH_SHIFT; |