From patchwork Fri Jul 18 13:34:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Thierry X-Patchwork-Id: 4584561 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ED3859F26C for ; Fri, 18 Jul 2014 13:34:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 264F820122 for ; Fri, 18 Jul 2014 13:34:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 41B9B20120 for ; Fri, 18 Jul 2014 13:34:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8078E6E122; Fri, 18 Jul 2014 06:34:28 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id D9ECE6E122 for ; Fri, 18 Jul 2014 06:34:26 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 18 Jul 2014 06:34:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,685,1400050800"; d="scan'208";a="458607121" Received: from michelth-linux.iwi.intel.com ([172.28.253.148]) by azsmga001.ch.intel.com with ESMTP; 18 Jul 2014 06:33:57 -0700 From: Michel Thierry To: intel-gfx@lists.freedesktop.org Date: Fri, 18 Jul 2014 14:34:01 +0100 Message-Id: <1405690441-346-1-git-send-email-michel.thierry@intel.com> X-Mailer: git-send-email 1.9.0 Subject: [Intel-gfx] [PATCH] drm/i915: capture_reg_state interrupt registers for Gen8 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After unclaimed register detection was enabled for BDW, I started seeing warnings while reading registers 0x4400c (DEIER) and 0x4401c (GTIER). From Gen8, DEIER has been split per display engine pipe, and GTIER has been split in 4. Signed-off-by: Michel Thierry --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gpu_error.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 37b3e42..9e6f201 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -315,6 +315,8 @@ struct drm_i915_error_state { u32 eir; u32 pgtbl_er; u32 ier; + u32 pipe_ier[I915_MAX_PIPES]; /* gen8 */ + u32 gt_ier[4]; /* gen8 */ u32 ccid; u32 derrmr; u32 forcewake; diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 71aee43..1e57574 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -393,6 +393,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, if (INTEL_INFO(dev)->gen == 7) err_printf(m, "ERR_INT: 0x%08x\n", error->err_int); + if (INTEL_INFO(dev)->gen == 8) { + for (i = 0; i < ARRAY_SIZE(error->pipe_ier); i++) + err_printf(m, "PIPE_IER_%d: 0x%08x\n", i, + error->pipe_ier[i]); + + for (i = 0; i < ARRAY_SIZE(error->gt_ier); i++) + err_printf(m, "GT_IER_%d: 0x%08x\n", i, + error->gt_ier[i]); + } + for (i = 0; i < ARRAY_SIZE(error->ring); i++) { err_printf(m, "%s command stream:\n", ring_str(i)); i915_ring_error_state(m, dev, &error->ring[i]); @@ -1122,6 +1132,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) { struct drm_device *dev = dev_priv->dev; + int i, pipe; /* General organization * 1. Registers specific to a single generation @@ -1166,7 +1177,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, if (HAS_HW_CONTEXTS(dev)) error->ccid = I915_READ(CCID); - if (HAS_PCH_SPLIT(dev)) + if (IS_GEN8(dev)) { + for_each_pipe(pipe) + error->pipe_ier[pipe] = + I915_READ(GEN8_DE_PIPE_IER(pipe)); + for (i = 0; i < 4; i++) + error->gt_ier[i] = I915_READ(GEN8_GT_IER(i)); + } else if (HAS_PCH_SPLIT(dev)) error->ier = I915_READ(DEIER) | I915_READ(GTIER); else { if (IS_GEN2(dev))