From patchwork Mon Sep 14 17:27:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gamari X-Patchwork-Id: 47350 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8EHRcPo027578 for ; Mon, 14 Sep 2009 17:27:38 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F20019F374; Mon, 14 Sep 2009 10:27:37 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qy0-f203.google.com (mail-qy0-f203.google.com [209.85.221.203]) by gabe.freedesktop.org (Postfix) with ESMTP id B9A929E7F3 for ; Mon, 14 Sep 2009 10:27:34 -0700 (PDT) Received: by mail-qy0-f203.google.com with SMTP id 41so2477958qyk.25 for ; Mon, 14 Sep 2009 10:27:34 -0700 (PDT) Received: by 10.224.31.78 with SMTP id x14mr5412968qac.196.1252949253924; Mon, 14 Sep 2009 10:27:33 -0700 (PDT) Received: from localhost.localdomain ([128.119.194.104]) by mx.google.com with ESMTPS id 20sm1964742qyk.1.2009.09.14.10.27.31 (version=SSLv3 cipher=RC4-MD5); Mon, 14 Sep 2009 10:27:32 -0700 (PDT) From: Ben Gamari To: Jesse Barnes , Owain Ainsworth Date: Mon, 14 Sep 2009 13:27:13 -0400 Message-Id: <1252949236-2906-4-git-send-email-bgamari.foss@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252949236-2906-3-git-send-email-bgamari.foss@gmail.com> References: <1252949236-2906-1-git-send-email-bgamari.foss@gmail.com> <1252949236-2906-2-git-send-email-bgamari.foss@gmail.com> <1252949236-2906-3-git-send-email-bgamari.foss@gmail.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 3/6] drm/i915: Unmark i915_seqno_passed as static X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org We'll need it in i915_irq.c for checking whether there are outstanding requests. Also, the function really ought to return a bool, not an int. Signed-off-by: Ben Gamari --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 01b2920..933d832 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -709,6 +709,7 @@ int i915_gem_object_unbind(struct drm_gem_object *obj); void i915_gem_release_mmap(struct drm_gem_object *obj); void i915_gem_lastclose(struct drm_device *dev); uint32_t i915_get_gem_seqno(struct drm_device *dev); +bool i915_seqno_passed(uint32_t seq1, uint32_t seq2); int i915_gem_object_get_fence_reg(struct drm_gem_object *obj); int i915_gem_object_put_fence_reg(struct drm_gem_object *obj); void i915_gem_retire_requests(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 9100513..c70e91b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1671,7 +1671,7 @@ out: /** * Returns true if seq1 is later than seq2. */ -static int +bool i915_seqno_passed(uint32_t seq1, uint32_t seq2) { return (int32_t)(seq1 - seq2) >= 0;