From patchwork Tue Apr 26 10:12:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Feng, Boqun" X-Patchwork-Id: 732162 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 p3QACUR2011625 for ; Tue, 26 Apr 2011 10:12:51 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 767859E8AF for ; Tue, 26 Apr 2011 03:12:29 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EDF69E77E for ; Tue, 26 Apr 2011 03:12:09 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 26 Apr 2011 03:12:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.64,267,1301900400"; d="scan'208";a="684030875" Received: from unknown (HELO localhost) ([10.239.47.162]) by fmsmga002.fm.intel.com with ESMTP; 26 Apr 2011 03:12:08 -0700 From: "Feng, Boqun" To: intel-gfx@lists.freedesktop.org Date: Tue, 26 Apr 2011 18:12:52 +0800 Message-Id: <1303812772-5370-1-git-send-email-boqun.feng@intel.com> X-Mailer: git-send-email 1.7.4.4 Subject: [Intel-gfx] [PATCH] fix interrupt request miss problem in bsd ring for g4x 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 26 Apr 2011 10:12:51 +0000 (UTC) Signed-off-by: Feng, Boqun --- drivers/gpu/drm/i915/intel_ringbuffer.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index e9e6f71..6606ca7 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -609,8 +609,12 @@ ring_get_irq(struct intel_ring_buffer *ring, u32 flag) return false; spin_lock(&ring->irq_lock); - if (ring->irq_refcount++ == 0) - ironlake_enable_irq(dev_priv, flag); + if (ring->irq_refcount++ == 0) { + if (HAS_PCH_SPLIT(dev)) + ironlake_enable_irq(dev_priv, flag); + else + i915_enable_irq(dev_priv, flag); + } spin_unlock(&ring->irq_lock); return true; @@ -623,8 +627,12 @@ ring_put_irq(struct intel_ring_buffer *ring, u32 flag) drm_i915_private_t *dev_priv = dev->dev_private; spin_lock(&ring->irq_lock); - if (--ring->irq_refcount == 0) - ironlake_disable_irq(dev_priv, flag); + if (--ring->irq_refcount == 0) { + if (HAS_PCH_SPLIT(dev)) + ironlake_disable_irq(dev_priv, flag); + else + i915_disable_irq(dev_priv, flag); + } spin_unlock(&ring->irq_lock); } @@ -666,12 +674,22 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) static bool bsd_ring_get_irq(struct intel_ring_buffer *ring) { - return ring_get_irq(ring, GT_BSD_USER_INTERRUPT); + struct drm_device *dev = ring->dev; + + if (HAS_PCH_SPLIT(dev)) + return ring_get_irq(ring, GT_BSD_USER_INTERRUPT); + else + return ring_get_irq(ring, I915_BSD_USER_INTERRUPT); } static void bsd_ring_put_irq(struct intel_ring_buffer *ring) { - ring_put_irq(ring, GT_BSD_USER_INTERRUPT); + struct drm_device *dev = ring->dev; + + if (HAS_PCH_SPLIT(dev)) + ring_put_irq(ring, GT_BSD_USER_INTERRUPT); + else + ring_put_irq(ring, I915_BSD_USER_INTERRUPT); } static int