Mesa (master): intel: Require kernel 2.6.39 for relaxed relocation support.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Apr 8 18:03:26 UTC 2013
Module: Mesa
Branch: master
Commit: 394edb5af5161f664c0c3b4eaba9be4e30f3c138
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=394edb5af5161f664c0c3b4eaba9be4e30f3c138
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Apr 5 23:59:52 2013 -0700
intel: Require kernel 2.6.39 for relaxed relocation support.
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 <kenneth at whitecape.org>
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
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;
}
More information about the mesa-commit
mailing list