diff options
| -rw-r--r-- | src/i830_batchbuffer.h | 25 | ||||
| -rw-r--r-- | src/i830_driver.c | 5 | ||||
| -rw-r--r-- | src/i830_uxa.c | 18 |
3 files changed, 30 insertions, 18 deletions
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h index 1fc273bb..2793bc01 100644 --- a/src/i830_batchbuffer.h +++ b/src/i830_batchbuffer.h @@ -98,13 +98,21 @@ static inline void intel_batch_emit_reloc(intel_screen_private *intel, dri_bo * bo, uint32_t read_domains, - uint32_t write_domains, uint32_t delta) + uint32_t write_domains, uint32_t delta, int needs_fence) { assert(intel_batch_space(intel) >= 4); *(uint32_t *) (intel->batch_ptr + intel->batch_used) = bo->offset + delta; - dri_bo_emit_reloc(intel->batch_bo, read_domains, write_domains, delta, - intel->batch_used, bo); + if (needs_fence) + drm_intel_bo_emit_reloc_fence(intel->batch_bo, + intel->batch_used, + bo, delta, + read_domains, write_domains); + else + drm_intel_bo_emit_reloc(intel->batch_bo, intel->batch_used, + bo, delta, + read_domains, write_domains); + intel->batch_used += 4; } @@ -132,7 +140,7 @@ intel_batch_mark_pixmap_domains(intel_screen_private *intel, static inline void intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap, uint32_t read_domains, uint32_t write_domain, - uint32_t delta) + uint32_t delta, int needs_fence) { struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap); @@ -143,17 +151,20 @@ intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap, intel_batch_emit_reloc(intel, priv->bo, read_domains, write_domain, - delta); + delta, needs_fence); } #define ALIGN_BATCH(align) intel_batch_align(intel, align); #define OUT_BATCH(dword) intel_batch_emit_dword(intel, dword) #define OUT_RELOC(bo, read_domains, write_domains, delta) \ - intel_batch_emit_reloc (intel, bo, read_domains, write_domains, delta) + intel_batch_emit_reloc(intel, bo, read_domains, write_domains, delta, 0) #define OUT_RELOC_PIXMAP(pixmap, reads, write, delta) \ - intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta) + intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta, 0) + +#define OUT_RELOC_PIXMAP_FENCED(pixmap, reads, write, delta) \ + intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta, 1) union intfloat { float f; diff --git a/src/i830_driver.c b/src/i830_driver.c index 95b02f3a..0c36b25e 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1054,8 +1054,9 @@ void i830_init_bufmgr(ScrnInfoPtr scrn) if (IS_I865G(intel)) batch_size = 4096; - intel->bufmgr = intel_bufmgr_gem_init(intel->drmSubFD, batch_size); - intel_bufmgr_gem_enable_reuse(intel->bufmgr); + intel->bufmgr = drm_intel_bufmgr_gem_init(intel->drmSubFD, batch_size); + drm_intel_bufmgr_gem_enable_reuse(intel->bufmgr); + drm_intel_bufmgr_gem_enable_fenced_relocs(intel->bufmgr); list_init(&intel->batch_pixmaps); list_init(&intel->flush_pixmaps); diff --git a/src/i830_uxa.c b/src/i830_uxa.c index 589e16d4..09c2ef31 100644 --- a/src/i830_uxa.c +++ b/src/i830_uxa.c @@ -295,8 +295,8 @@ static void i830_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2) OUT_BATCH(intel->BR[13] | pitch); OUT_BATCH((y1 << 16) | (x1 & 0xffff)); OUT_BATCH((y2 << 16) | (x2 & 0xffff)); - OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_RENDER, - I915_GEM_DOMAIN_RENDER, 0); + OUT_RELOC_PIXMAP_FENCED(pixmap, I915_GEM_DOMAIN_RENDER, + I915_GEM_DOMAIN_RENDER, 0); OUT_BATCH(intel->BR[16]); ADVANCE_BATCH(); } @@ -411,15 +411,15 @@ i830_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1, OUT_BATCH(intel->BR[13] | dst_pitch); OUT_BATCH((dst_y1 << 16) | (dst_x1 & 0xffff)); OUT_BATCH((dst_y2 << 16) | (dst_x2 & 0xffff)); - OUT_RELOC_PIXMAP(dest, - I915_GEM_DOMAIN_RENDER, - I915_GEM_DOMAIN_RENDER, - 0); + OUT_RELOC_PIXMAP_FENCED(dest, + I915_GEM_DOMAIN_RENDER, + I915_GEM_DOMAIN_RENDER, + 0); OUT_BATCH((src_y1 << 16) | (src_x1 & 0xffff)); OUT_BATCH(src_pitch); - OUT_RELOC_PIXMAP(intel->render_source, - I915_GEM_DOMAIN_RENDER, 0, - 0); + OUT_RELOC_PIXMAP_FENCED(intel->render_source, + I915_GEM_DOMAIN_RENDER, 0, + 0); ADVANCE_BATCH(); } |