From patchwork Wed Jan 12 22:22:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 475151 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 p0CMMMHp030812 for ; Wed, 12 Jan 2011 22:22:43 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A8F09EF52 for ; Wed, 12 Jan 2011 14:22:21 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from oproxy2-pub.bluehost.com (oproxy2-pub.bluehost.com [67.222.39.60]) by gabe.freedesktop.org (Postfix) with SMTP id 21C229E9FC for ; Wed, 12 Jan 2011 14:22:10 -0800 (PST) Received: (qmail 24497 invoked by uid 0); 12 Jan 2011 22:22:09 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy2.bluehost.com with SMTP; 12 Jan 2011 22:22:09 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=dscpFKjHOJLpcM+jFdudNLlhuYPYKE+JtsCPf1udRvMMUQMWXjpj375OHOXW0WhrvhTlBKKmhx3uMZL6VUNCNiasnTJ1afVciDILNVb+zWCTrgUB/p1dROvw6PFtmbjh; Received: from c-67-174-193-198.hsd1.ca.comcast.net ([67.174.193.198] helo=jbarnes-desktop) by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1Pd94y-0003Jd-WA; Wed, 12 Jan 2011 15:22:09 -0700 Date: Wed, 12 Jan 2011 14:22:06 -0800 From: Jesse Barnes To: Linus Torvalds Subject: Re: [git pull] drm intel only fixes Message-ID: <20110112142206.37a1b76d@jbarnes-desktop> In-Reply-To: References: <20110112114649.5365d518@jbarnes-desktop> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.174.193.198 authed with jbarnes@virtuousgeek.org} Cc: linux-kernel@vger.kernel.org, DRI mailing list X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=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]); Wed, 12 Jan 2011 22:22:43 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id p0CMMMHp030812 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e418e8b..4c6c465 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -428,6 +428,15 @@ static void pch_irq_handler(struct drm_device *dev) fdia = I915_READ(FDI_RXA_IIR); fdib = I915_READ(FDI_RXB_IIR); DRM_DEBUG_DRIVER("PCH FDI RX interrupt; FDI RXA IIR: 0x%08x, FDI RXB IIR: 0x%08x\n", fdia, fdib); + + if (fdia & FDI_RX_ERR_MASK) { + DRM_ERROR("FDI A RX error: 0x%08x\n", fdia); + I915_WRITE(FDI_RXA_IIR, FDI_RX_ERR_MASK); + } + if (fdib & FDI_RX_ERR_MASK) { + DRM_ERROR("FDI B RX error: 0x%08x\n", fdib); + I915_WRITE(FDI_RXB_IIR, FDI_RX_ERR_MASK); + } } if (pch_iir & (SDE_TRANSB_CRC_DONE | SDE_TRANSA_CRC_DONE)) @@ -437,9 +446,9 @@ static void pch_irq_handler(struct drm_device *dev) DRM_DEBUG_DRIVER("PCH transcoder CRC error interrupt\n"); if (pch_iir & SDE_TRANSB_FIFO_UNDER) - DRM_DEBUG_DRIVER("PCH transcoder B underrun interrupt\n"); + DRM_ERROR("PCH transcoder B underrun interrupt\n"); if (pch_iir & SDE_TRANSA_FIFO_UNDER) - DRM_DEBUG_DRIVER("PCH transcoder A underrun interrupt\n"); + DRM_ERROR("PCH transcoder A underrun interrupt\n"); } static irqreturn_t ironlake_irq_handler(struct drm_device *dev) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 40a407f..6e81d97 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3101,6 +3101,11 @@ #define FDI_RX_PIXEL_FIFO_OVERFLOW (1<<2) #define FDI_RX_CROSS_CLOCK_OVERFLOW (1<<1) #define FDI_RX_SYMBOL_QUEUE_OVERFLOW (1<<0) +#define FDI_RX_ERR_MASK (FDI_RX_FS_CODE_ERR | FDI_RX_FE_CODE_ERR | \ + FDI_RX_SYMBOL_ERR_RATE_ABOVE | \ + FDI_RX_PIXEL_FIFO_OVERFLOW | \ + FDI_RX_CROSS_CLOCK_OVERFLOW | \ + FDI_RX_SYMBOL_QUEUE_OVERFLOW) #define FDI_RXA_IIR 0xf0014 #define FDI_RXA_IMR 0xf0018