diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-10 11:05:20 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-11-10 15:19:08 +0000 |
| commit | 67af5a99253b1295f8dc09b28863eb7dc8b59e1d (patch) | |
| tree | a434b1f310c45d00affad115ede2ae92708d5a83 /src/i915_video.c | |
| parent | 998d6b3d8c549086fbc8a9f0e309694b23398d8d (diff) | |
Check that batch buffers are atomic.
Since batch buffers are rarely emitted by themselves but as part of a
sequence of state and vertices, the whole sequence is emitted atomically.
Here we just enforce that batches are marked as being part of an atomic
sequence as appropriate.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i915_video.c')
| -rw-r--r-- | src/i915_video.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i915_video.c b/src/i915_video.c index e54bd9b4..4e4ec03a 100644 --- a/src/i915_video.c +++ b/src/i915_video.c @@ -75,7 +75,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, IntelEmitInvarientState(scrn); intel->last_3d = LAST_3D_VIDEO; - BEGIN_BATCH(20); + ATOMIC_BATCH(20); /* flush map & render cache */ OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE | @@ -139,7 +139,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, if (!is_planar_fourcc(id)) { FS_LOCALS(10); - BEGIN_BATCH(16); + ATOMIC_BATCH(16); OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | 4); OUT_BATCH(0x0000001); /* constant 0 */ /* constant 0: brightness/contrast */ @@ -200,7 +200,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, } else { FS_LOCALS(16); - BEGIN_BATCH(22 + 11 + 11); + ATOMIC_BATCH(22 + 11 + 11); /* For the planar formats, we set up three samplers -- * one for each plane, in a Y8 format. Because I * couldn't get the special PLANAR_TO_PACKED @@ -390,7 +390,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, } { - BEGIN_BATCH(2); + ATOMIC_BATCH(2); OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE); OUT_BATCH(0x00000000); @@ -423,7 +423,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, src_scale_x = ((float)src_w / width) / drw_w; src_scale_y = ((float)src_h / height) / drw_h; - BEGIN_BATCH(8 + 12); + ATOMIC_BATCH(8 + 12); OUT_BATCH(MI_NOOP); OUT_BATCH(MI_NOOP); OUT_BATCH(MI_NOOP); |