From patchwork Sat Aug 8 20:34:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gamari X-Patchwork-Id: 40200 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 n78KZIIY030461 for ; Sat, 8 Aug 2009 20:35:18 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39CC19E93F; Sat, 8 Aug 2009 13:35:18 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from qw-out-1920.google.com (qw-out-1920.google.com [74.125.92.150]) by gabe.freedesktop.org (Postfix) with ESMTP id D2E3B9E938 for ; Sat, 8 Aug 2009 13:35:10 -0700 (PDT) Received: by qw-out-1920.google.com with SMTP id 4so850209qwk.12 for ; Sat, 08 Aug 2009 13:35:10 -0700 (PDT) Received: by 10.224.89.19 with SMTP id c19mr1336047qam.379.1249763710546; Sat, 08 Aug 2009 13:35:10 -0700 (PDT) Received: from localhost.localdomain ([128.164.237.143]) by mx.google.com with ESMTPS id 6sm7346363qwk.34.2009.08.08.13.35.09 (version=SSLv3 cipher=RC4-MD5); Sat, 08 Aug 2009 13:35:09 -0700 (PDT) From: Ben Gamari To: Owain Ainsworth , Jesse Barnes , Chris Wilson , intel-gfx@lists.freedesktop.org Date: Sat, 8 Aug 2009 16:34:47 -0400 Message-Id: <1249763687-5252-9-git-send-email-bgamari.foss@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249763687-5252-8-git-send-email-bgamari.foss@gmail.com> References: <1249763687-5252-1-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-2-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-3-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-4-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-5-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-6-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-7-git-send-email-bgamari.foss@gmail.com> <1249763687-5252-8-git-send-email-bgamari.foss@gmail.com> Subject: [Intel-gfx] [PATCH 8/8] Add debugging output to reset logic 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 --- drivers/gpu/drm/i915/i915_drv.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 576cb7e..07bc6d8 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -38,6 +38,8 @@ #include "drm_crtc_helper.h" +#include + static unsigned int i915_modeset = -1; module_param_named(modeset, i915_modeset, int, 0400); @@ -153,6 +155,7 @@ void i965_reset(struct drm_device *dev, u8 flags) udelay(100); } while (mutex_is_locked(&dev->struct_mutex) && time_after(timeout, jiffies)); + printk("i915: checking lock\n"); if (mutex_is_locked(&dev->struct_mutex)) { #if 1 DRM_ERROR("i915 struct_mutex lock is still held by %s. Giving on up reset.\n", dev->struct_mutex.owner->task->comm); @@ -169,13 +172,16 @@ void i965_reset(struct drm_device *dev, u8 flags) #endif debug_show_all_locks(); + printk("i915: Acquiring mutex\n"); mutex_lock(&dev->struct_mutex); /* * Clear request list */ + printk("i915: Retiring requests\n"); i915_gem_retire_requests(dev); + printk("i915: Saving display config\n"); if (need_display) i915_save_display(dev); @@ -191,6 +197,7 @@ void i965_reset(struct drm_device *dev, u8 flags) udelay(50); pci_write_config_byte(dev->pdev, GDRST, gdrst & 0xfeffffff); + printk("i915: Waiting for hardware to recover\n"); /* ...we don't want to loop forever though, 500ms should be plenty */ timeout = jiffies + msecs_to_jiffies(500); do { @@ -229,11 +236,13 @@ void i965_reset(struct drm_device *dev, u8 flags) struct drm_i915_gem_object *obj_priv = obj->driver_private; dev_priv->mm.suspended = 0; + printk("i915: Stop ring\n"); /* Stop the ring if it's running. */ I915_WRITE(PRB0_CTL, 0); I915_WRITE(PRB0_TAIL, 0); I915_WRITE(PRB0_HEAD, 0); + printk("i915: Init ring\n"); /* Initialize the ring. */ I915_WRITE(PRB0_START, obj_priv->gtt_offset); I915_WRITE(PRB0_CTL, @@ -251,7 +260,9 @@ void i965_reset(struct drm_device *dev, u8 flags) } mutex_unlock(&dev->struct_mutex); + printk("i915: irq_uninstall\n"); drm_irq_uninstall(dev); + printk("i915: irq_install\n"); drm_irq_install(dev); mutex_lock(&dev->struct_mutex); } @@ -259,6 +270,7 @@ void i965_reset(struct drm_device *dev, u8 flags) /* * Display needs restore too... */ + printk("i915: Restore display\n"); if (need_display) i915_restore_display(dev);