diff options
| author | Eric Anholt <eric@anholt.net> | 2009-04-20 15:58:35 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-27 17:05:59 -0700 |
| commit | 393abc15b76804580bfee0760ddbd1fb77e66c02 (patch) | |
| tree | 06818761f69e2a570d48987e75d3e9c1505479ab | |
| parent | dc71573292c215f49716f4dc1ebc416c6b172995 (diff) | |
Now that video destination pixmaps are always in BOs, no more MarkSync.
| -rw-r--r-- | src/i915_video.c | 2 | ||||
| -rw-r--r-- | src/i965_video.c | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/i915_video.c b/src/i915_video.c index 93e0c86a..1d1fa018 100644 --- a/src/i915_video.c +++ b/src/i915_video.c @@ -415,7 +415,5 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, } intel_batch_end_atomic(pScrn); - - i830MarkSync(pScrn); } diff --git a/src/i965_video.c b/src/i965_video.c index f6020d4e..1d0ed74c 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -375,13 +375,10 @@ i965_create_dst_surface_state(ScrnInfoPtr scrn, dest_surf_state->ss0.mipmap_layout_mode = 0; dest_surf_state->ss0.render_cache_read_mode = 0; - if (pixmap_bo != NULL) - dest_surf_state->ss1.base_addr = - intel_emit_reloc(surf_bo, offsetof(struct brw_surface_state, ss1), - pixmap_bo, 0, - I915_GEM_DOMAIN_SAMPLER, 0); - else - dest_surf_state->ss1.base_addr = intel_get_pixmap_offset(pixmap); + dest_surf_state->ss1.base_addr = + intel_emit_reloc(surf_bo, offsetof(struct brw_surface_state, ss1), + pixmap_bo, 0, + I915_GEM_DOMAIN_SAMPLER, 0); dest_surf_state->ss2.height = scrn->virtualY - 1; dest_surf_state->ss2.width = scrn->virtualX - 1; @@ -1160,7 +1157,6 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, i965_post_draw_debug(pScrn); } - i830MarkSync(pScrn); #if WATCH_STATS i830_dump_error_state(pScrn); #endif |