From patchwork Tue Jun 14 04:18:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 877732 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5E4JMW7000571 for ; Tue, 14 Jun 2011 04:19:42 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED0449E78D for ; Mon, 13 Jun 2011 21:19:21 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id B00A79EE9D for ; Mon, 13 Jun 2011 21:18:37 -0700 (PDT) Received: by vws8 with SMTP id 8so5380387vws.36 for ; Mon, 13 Jun 2011 21:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=n+4D7HWyECd5Sr+luYh+Ac93hS9ptwaD7oS1VDGsYYQ=; b=DSmopcCxs3sn+17kGGGUUaMp8iq+KWikfgXWBWTiaESorSpkEnYUoWhFxBYndYI1uT T8BYWlYK1A1hBF0kRRKjGX2vL3Zx5PvQpK73t0USC2iVwEJyvK7J5hZIzbIQQENYucla c9biJcDFYcxboK2PPXszBbZ44awTYkSlfMHtM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=LHSyzokcFjHnrtVbwZybZX6d9mmCmCrff2epjGYG5gCBtHtHUZqrzPaPrnorHwNCfj Yb0N2JKB1AAiI4H1QU2+4h3Ruriag692tmmHW2zv4l8cX53RZ70tIvWtTaNCej7BKwy1 iP3IZttv+Ri4usEwDSl+jNPZLl8Ogq5sCDbIk= MIME-Version: 1.0 Received: by 10.52.100.3 with SMTP id eu3mr5281475vdb.31.1308025116095; Mon, 13 Jun 2011 21:18:36 -0700 (PDT) Received: by 10.52.167.106 with HTTP; Mon, 13 Jun 2011 21:18:36 -0700 (PDT) Date: Tue, 14 Jun 2011 12:18:36 +0800 Message-ID: From: Daniel J Blueman To: Eric Anholt Cc: Dave Airlie , intel-gfx@lists.freedesktop.org, Keith Packard Subject: [Intel-gfx] [3.0-rc3] i1915: missed IRQ/stalls patch success 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: , 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Jun 2011 04:19:42 +0000 (UTC) Hi Eric, The frequent ~1.5s pauses I hit with SNB hardware in the gnome3 UI (eg whenever you hit the top-left of the screen to show all windows) are nicely addressed by your recent wake patch [1] (ported to -rc3). Thus I see no 'missed IRQ' kernel messages. As this addresses a significant usability regression, are you happy to add it to the 3.0-rc queue? I think it has very good value in -stable also (assuming correctness). What do you think? Thanks, Daniel --- [1] http://lists.freedesktop.org/archives/intel-gfx/2011-June/010863.html @@ -648,9 +650,11 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) spin_lock(&ring->irq_lock); if (--ring->irq_refcount == 0) { + gen6_gt_force_wake_get(dev_priv); ring->irq_mask |= rflag; I915_WRITE_IMR(ring, ring->irq_mask); ironlake_disable_irq(dev_priv, gflag); + gen6_gt_force_wake_put(dev_priv); } spin_unlock(&ring->irq_lock); } diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 95c4b14..d3ef07f 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -631,9 +631,11 @@ gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) spin_lock(&ring->irq_lock); if (ring->irq_refcount++ == 0) { + gen6_gt_force_wake_get(dev_priv); ring->irq_mask &= ~rflag; I915_WRITE_IMR(ring, ring->irq_mask); ironlake_enable_irq(dev_priv, gflag); + gen6_gt_force_wake_put(dev_priv); } spin_unlock(&ring->irq_lock);