Chris Wilson's relaxed relocation patch landed in March 2011. Anyone
running pre-3.0 kernels probably isn't going to get the latest Mesa
anyway.
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
---
src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 --
src/mesa/drivers/dri/intel/intel_screen.c | 7 ++++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c
b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 07f9f00..d2451f9 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -517,8 +517,6 @@ static void brw_prepare_vertices(struct brw_context *brw)
brw->vb.start_vertex_bias = -delta;
delta = 0;
}
- if (delta && !brw->intel.intelScreen->relaxed_relocations)
- min_index = delta = 0;
/* Handle any arrays to be uploaded. */
if (nr_uploads > 1) {
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c
b/src/mesa/drivers/dri/intel/intel_screen.c
index 3ca10c8..eb451ba 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -1008,9 +1008,10 @@ intel_init_bufmgr(struct intel_screen *intelScreen)
drm_intel_bufmgr_gem_enable_fenced_relocs(intelScreen->bufmgr);
- intelScreen->relaxed_relocations = 0;
- intelScreen->relaxed_relocations |=
- intel_get_boolean(spriv, I915_PARAM_HAS_RELAXED_DELTA) << 0;
+ if (!intel_get_boolean(spriv, I915_PARAM_HAS_RELAXED_DELTA)) {
+ fprintf(stderr, "[%s: %u] Kernel 2.6.39 required.\n", __func__,
__LINE__);
+ return false;
+ }
return true;
}
--
1.8.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
