From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH] drm/i915: enable semaphores on per-device
	defaults
Date: Mon, 21 Nov 2011 13:08:52 +0000
Message-ID: <e0d58a$2amtvs@orsmga002.jf.intel.com>
References: <1321880629-23854-1-git-send-email-eugeni.dodonov@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id 922CE9E7E1
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 21 Nov 2011 05:09:23 -0800 (PST)
In-Reply-To: <1321880629-23854-1-git-send-email-eugeni.dodonov@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Ben Widawsky <ben@bwidawsk.net>, Eugeni Dodonov <eugeni.dodonov@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

On Mon, 21 Nov 2011 11:03:49 -0200, Eugeni Dodonov <eugeni.dodonov@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