diff options
| author | Kenneth Graunke <[email protected]> | 2013-04-05 23:59:52 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-04-08 11:03:08 -0700 |
| commit | 394edb5af5161f664c0c3b4eaba9be4e30f3c138 (patch) | |
| tree | 0c08e8aa51bc016bda4963e121b253abd22012ea /src/mesa | |
| parent | d7fd5696e66a7fe0212f057443679b080c87d483 (diff) | |
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 <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 | ||||
| -rw-r--r-- | 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 07f9f004fb8..d2451f9c9ed 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 3ca10c8e534..eb451ba546b 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; } |