From patchwork Mon Nov 1 20:23:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 295812 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA1KPQH1022642 for ; Mon, 1 Nov 2010 20:25:46 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A5B99F4F3 for ; Mon, 1 Nov 2010 13:25:26 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A8B99F4D7; Mon, 1 Nov 2010 13:24:05 -0700 (PDT) Received: from pollan.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id 43341130052; Mon, 1 Nov 2010 13:24:02 -0700 (PDT) Received: by pollan.anholt.net (Postfix, from userid 1000) id 791A6640D9; Mon, 1 Nov 2010 13:23:59 -0700 (PDT) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Mon, 1 Nov 2010 13:23:43 -0700 Message-Id: <1288643024-5706-4-git-send-email-eric@anholt.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1288643024-5706-1-git-send-email-eric@anholt.net> References: <1288643024-5706-1-git-send-email-eric@anholt.net> Subject: [Intel-gfx] [PATCH 3/4] drm/i915: Declare waits on GPU as io waits, to reduce C-state reduction. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 01 Nov 2010 20:25:46 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8eb8453..8991588 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1988,12 +1988,12 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, ring->waiting_gem_seqno = seqno; ring->user_irq_get(dev, ring); if (interruptible) - ret = wait_event_interruptible(ring->irq_queue, + ret = io_wait_event_interruptible(ring->irq_queue, i915_seqno_passed( ring->get_seqno(dev, ring), seqno) || atomic_read(&dev_priv->mm.wedged)); else - wait_event(ring->irq_queue, + io_wait_event(ring->irq_queue, i915_seqno_passed( ring->get_seqno(dev, ring), seqno) || atomic_read(&dev_priv->mm.wedged));