On Mon, 21 Nov 2011 11:03:49 -0200, Eugeni Dodonov <eugeni.dodonov at intel.com> wrote: > We should enable semaphores on IVB by default, and on SNB in cases where > dma remapping is disabled or iommu is not enabled. > > v2: adapt patch according to the feedback, and put it in line with Keith's > rc6 enabling patch. > --- > static int > i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj, > struct intel_ring_buffer *to) > @@ -758,7 +780,7 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj, > return 0; > > /* XXX gpu semaphores are implicated in various hard hangs on SNB */ > - if (INTEL_INFO(obj->base.dev)->gen < 6 || !i915_semaphores) > + if (INTEL_INFO(obj->base.dev)->gen < 6 || !intel_enable_semaphores(obj->base.dev)) Just merge the generation check into intel_enable_semaphores(). -Chris -- Chris Wilson, Intel Open Source Technology Centre
