From: "Lister, Ian" <ian.lister@intel.com>
To: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Subject: [RFC 07/13] drm/i915: Additional debug for TDR
Date: Mon, 16 Dec 2013 16:03:11 +0000 [thread overview]
Message-ID: <1387209790.3445.56.camel@ilister2-linux.isw.intel.com> (raw)
>From d9e59b16738684ccbc8a82db5b46ab6c0daf507e Mon Sep 17 00:00:00 2001
Message-Id: <d9e59b16738684ccbc8a82db5b46ab6c0daf507e.1387201899.git.ian.lister@intel.com>
In-Reply-To: <cover.1387201899.git.ian.lister@intel.com>
References: <cover.1387201899.git.ian.lister@intel.com>
From: ian-lister <ian.lister@intel.com>
Date: Tue, 10 Dec 2013 14:56:06 +0000
Subject: [RFC 07/13] drm/i915: Additional debug for TDR
Additional debug in i915_request_guilty and gen6_do_reset.
Signed-off-by: ian-lister <ian.lister@intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 4 ++++
drivers/gpu/drm/i915/intel_uncore.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 42a1647..5b76da4 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2251,12 +2251,16 @@ static bool i915_request_guilty(struct drm_i915_gem_request *request,
if (i915_head_inside_object(acthd, request->batch_obj,
request_to_vm(request))) {
*inside = true;
+ DRM_DEBUG_TDR("Head in obj 0x%08x\n",
+ request->batch_obj);
return true;
}
}
if (i915_head_inside_request(acthd, request->head, request->tail)) {
*inside = false;
+ DRM_DEBUG_TDR("Head in req 0x%08x (HD: 0x%08x TL: 0x%08x)\n",
+ request, request->head, request->tail);
return true;
}
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 8ab5385..79182bd 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -959,6 +959,8 @@ static int gen6_do_reset(struct drm_device *dev)
int ret;
unsigned long irqflags;
+ DRM_ERROR("Reset GPU (GPU Hang)\n");
+
/* Hold uncore.lock across reset to prevent any register access
* with forcewake not set correctly
*/
--
1.8.5.1
reply other threads:[~2013-12-16 16:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387209790.3445.56.camel@ilister2-linux.isw.intel.com \
--to=ian.lister@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox