From patchwork Wed May 29 19:43:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2632481 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 3CA1140077 for ; Wed, 29 May 2013 19:43:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 16FDBE5F41 for ; Wed, 29 May 2013 12:43:29 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C721E5EF4 for ; Wed, 29 May 2013 12:43:17 -0700 (PDT) Received: by mail-ea0-f182.google.com with SMTP id r16so5507828ead.27 for ; Wed, 29 May 2013 12:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=qJlciu+yweQ6bPZzR2qAvA0DoOGLKrRiKDb5iYrZSE0=; b=J1WXKJxzRq9vxzcKXCG8wU2bKVv8lUNCBXb60WuObzEgGSfQR7MY3gdJCYRd9+JkRN rpOkt0ghfeTzPohafVohU4mIRA4eFuo1aZbfm+huu7RrqrA9UcSn8mYzKCsjeW/5pmKA 3/paWIM6Qi3kDR1px2nHOMb3L3fRqsx9H9V3o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=qJlciu+yweQ6bPZzR2qAvA0DoOGLKrRiKDb5iYrZSE0=; b=Ug1UE2ZqqM4uN1wiHy5fyGqVYjdxI1C3O/SKJ55oTnNfDCzzuWze1xzHhRc0POYMqq ap+sRqfHL4u+v2WjPj26IPWKe1yHJL0X3rtPb7lUIEVHpiwP2Oaucd+NdnGd2kvrJnTc cDKkKuikhFGhICWmPUuFLkJgWD2CFZgHs5k1QhOexLb+gq5e4kGX6YAeQ0roqMvi6fDG EV6ZRTHXbtpT6iaULMViGABgakCT1nQ2AR2OKlhKZULsYXITsH8xMlSTNwOFIlt8LYay pjSpAoggiMkIX32ULneA7Sy0Q9Mq+67APLwYSjGo4SDrXa1X7V9NjtBk+OkTPhZwj7Pa 69Xg== X-Received: by 10.15.21.65 with SMTP id c41mr5694440eeu.3.1369856592071; Wed, 29 May 2013 12:43:12 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id s8sm55944588eeo.4.2013.05.29.12.43.10 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 May 2013 12:43:11 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 29 May 2013 21:43:05 +0200 Message-Id: <1369856585-15071-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlSmDhinD8w8ShMmX5PPYnsQWjCOcRCzh21KLmj9HzfHKqrSoGqfC8ZXyQjCAVzKj4P7g7i Cc: Daniel Vetter , Ben Widawsky , Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: fix pch_nop support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 This was accidentally broken in the south error interrupt handling work: commit 8664281b64c457705db72fc60143d03827e75ca9 Author: Paulo Zanoni Date: Fri Apr 12 17:57:57 2013 -0300 drm/i915: report Gen5+ CPU and PCH FIFO underruns Cc: Paulo Zanoni Cc: Ben Widawsky Signed-off-by: Daniel Vetter Reviewed-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index da5c9ab..7c9264f 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2610,6 +2610,9 @@ static void ibx_irq_postinstall(struct drm_device *dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; u32 mask; + if (HAS_PCH_NOP(dev)) + return; + if (HAS_PCH_IBX(dev)) { mask = SDE_GMBUS | SDE_AUX_MASK | SDE_TRANSB_FIFO_UNDER | SDE_TRANSA_FIFO_UNDER | SDE_POISON; @@ -2619,9 +2622,6 @@ static void ibx_irq_postinstall(struct drm_device *dev) I915_WRITE(SERR_INT, I915_READ(SERR_INT)); } - if (HAS_PCH_NOP(dev)) - return; - I915_WRITE(SDEIIR, I915_READ(SDEIIR)); I915_WRITE(SDEIMR, ~mask); }