From: Kenneth Graunke Date: Sat, 6 Apr 2013 07:08:37 +0000 (-0700) Subject: intel: Remove check for kernel 2.6.29. X-Git-Tag: android-x86-4.4-r1~508 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=97e40a524ebee72dc06208f2c730c25c962dea2a;p=android-x86%2Fexternal-mesa.git intel: Remove check for kernel 2.6.29. Now that we require 2.6.39, there's no need to also check for 2.6.29. Calling drm_intel_bufmgr_gem_enable_fenced_relocs() without checking should be safe, as it simply sets a flag. This does remove the check for zero fences available, but that doesn't seem worth checking. Signed-off-by: Kenneth Graunke Reviewed-by: Daniel Vetter Reviewed-by: Eric Anholt --- diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index eb451ba546b..58496e232c9 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -989,7 +989,6 @@ static bool intel_init_bufmgr(struct intel_screen *intelScreen) { __DRIscreen *spriv = intelScreen->driScrnPriv; - int num_fences = 0; intelScreen->no_hw = getenv("INTEL_NO_HW") != NULL; @@ -1000,12 +999,6 @@ intel_init_bufmgr(struct intel_screen *intelScreen) return false; } - if (!intel_get_param(spriv, I915_PARAM_NUM_FENCES_AVAIL, &num_fences) || - num_fences == 0) { - fprintf(stderr, "[%s: %u] Kernel 2.6.29 required.\n", __func__, __LINE__); - return false; - } - drm_intel_bufmgr_gem_enable_fenced_relocs(intelScreen->bufmgr); if (!intel_get_boolean(spriv, I915_PARAM_HAS_RELAXED_DELTA)) {