From patchwork Tue May 5 08:53:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 6336051 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 157BA9F440 for ; Tue, 5 May 2015 08:54:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3110020221 for ; Tue, 5 May 2015 08:54:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4D20720225 for ; Tue, 5 May 2015 08:54:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3A2289DB9; Tue, 5 May 2015 01:54:12 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from relay.fireflyinternet.com (hostedrelay.fireflyinternet.com [109.228.30.76]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CC9589D4D for ; Tue, 5 May 2015 01:54:11 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by relay.fireflyinternet.com (FireflyRelay1) with ESMTP id 570379-1305619 for multiple; Tue, 05 May 2015 09:54:13 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 5 May 2015 09:53:56 +0100 Message-Id: <1430816040-25285-2-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1430816040-25285-1-git-send-email-chris@chris-wilson.co.uk> References: <1430816040-25285-1-git-send-email-chris@chris-wilson.co.uk> X-Authenticated-User: chris.alporthouse@surfanytime.net Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/6] intel: Use WAIT for wait-rendering X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using WAIT is preferrable to SET_DOMAIN as it doesn't have any domain management side-effects - but has the same flushing semantics. Signed-off-by: Chris Wilson Cc: Daniel Vetter --- intel/intel_bufmgr_gem.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index eeb9acf..43cbae5 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -1729,6 +1729,24 @@ drm_intel_gem_bo_get_subdata(drm_intel_bo *bo, unsigned long offset, static void drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo) { + drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; + + /* Using WAIT is preferrable to SET_DOMAIN as it doesn't have + * any domain management side-effects - but has the same flushing + * semantics. + */ + if (bufmgr_gem->has_wait_timeout) { + struct drm_i915_gem_wait wait; + + memclear(wait); + wait.bo_handle = bo->handle; + wait.timeout_ns = -1; + if (drmIoctl(bufmgr_gem->fd, + DRM_IOCTL_I915_GEM_WAIT, + &wait) == 0) + return; + } + drm_intel_gem_bo_start_gtt_access(bo, 1); }