From patchwork Fri Nov 6 02:13:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 57987 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 nA62ELK0014366 for ; Fri, 6 Nov 2009 02:14:21 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 38B93A024A; Thu, 5 Nov 2009 18:14:19 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fmsmga101.fm.intel.com (mga05.intel.com [192.55.52.89]) by gabe.freedesktop.org (Postfix) with ESMTP id BF607A0236 for ; Thu, 5 Nov 2009 18:14:13 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 05 Nov 2009 18:10:00 -0800 X-ExtLoop1: 1 Received: from unknown (HELO localhost.localdomain) ([10.239.36.125]) by fmsmga002.fm.intel.com with ESMTP; 05 Nov 2009 18:08:16 -0800 From: Zhenyu Wang To: eric@anholt.net Date: Fri, 6 Nov 2009 10:13:01 +0800 Message-Id: <1257473583-2746-5-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1257473583-2746-4-git-send-email-zhenyuw@linux.intel.com> References: <1257473583-2746-1-git-send-email-zhenyuw@linux.intel.com> <1257473583-2746-2-git-send-email-zhenyuw@linux.intel.com> <1257473583-2746-3-git-send-email-zhenyuw@linux.intel.com> <1257473583-2746-4-git-send-email-zhenyuw@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org, Stable Team Subject: [Intel-gfx] [PATCH 4/6] drm/i915: Fix IRQ stall issue on Ironlake 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 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index f1fbfdd..417ba99 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -268,10 +268,15 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int ret = IRQ_NONE; - u32 de_iir, gt_iir; + u32 de_iir, gt_iir, de_ier; u32 new_de_iir, new_gt_iir; struct drm_i915_master_private *master_priv; + /* disable master interrupt before clearing iir */ + de_ier = I915_READ(DEIER); + I915_WRITE(DEIER, de_ier & ~DE_MASTER_IRQ_CONTROL); + (void)I915_READ(DEIER); + de_iir = I915_READ(DEIIR); gt_iir = I915_READ(GTIIR); @@ -307,6 +312,9 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev) gt_iir = new_gt_iir; } + I915_WRITE(DEIER, de_ier); + (void)I915_READ(DEIER); + return ret; }