Attachment 110605 Details for Bug 86626 – Detect GPU page faults

[patch] Detect GPU page faults

0001-drm-i915-Detect-page-faults-during-hangcheck.patch (text/plain), 1.80 KB, created by Chris Wilson on 2014-12-09 08:15:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-12-09 08:15:20 UTC

Size: 1.80 KB

patch

obsolete

>From 6deb688ce91bedaf7adbe4e98cc11747463c96c1 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 5 Dec 2014 14:08:00 +0000
>Subject: [PATCH] drm/i915: Detect page faults during hangcheck
>
>On Sandybridge+, the GPU provides the ERROR register for detecting page
>faults. Hook this up to our hangcheck so that we can dump the error
>state soon after such an event occurs. This would be better inside an
>interrupt handler, but it serves a purpose here as it detects that our
>initial context setup is invalid...
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_irq.c     | 5 +++++
> drivers/gpu/drm/i915/intel_uncore.c | 2 ++
> 2 files changed, 7 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 08a5a4ba52ac..c295cb614544 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -2969,6 +2969,11 @@ static void i915_hangcheck_elapsed(unsigned long data)
> 	if (!i915.enable_hangcheck)
> 		return;
> 
>+	if (INTEL_INFO(dev_priv)->gen >= 6 && I915_READ(ERROR_GEN6)) {
>+		i915_handle_error(dev, false, "GPU reported a page fault");
>+		I915_WRITE(ERROR_GEN6, 0);
>+	}
>+
> 	for_each_ring(ring, dev_priv, i) {
> 		u64 acthd;
> 		u32 seqno;
>diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
>index 0655b44651a7..67f2e24c5bc5 100644
>--- a/drivers/gpu/drm/i915/intel_uncore.c
>+++ b/drivers/gpu/drm/i915/intel_uncore.c
>@@ -535,6 +535,8 @@ static void __intel_uncore_early_sanitize(struct drm_device *dev,
> 	if (IS_GEN6(dev) || IS_GEN7(dev))
> 		__raw_i915_write32(dev_priv, GTFIFODBG,
> 				   __raw_i915_read32(dev_priv, GTFIFODBG));
>+	if (INTEL_INFO(dev)->gen >= 6)
>+		__raw_i915_write32(dev_priv, ERROR_GEN6, 0);
> 
> 	intel_uncore_forcewake_reset(dev, restore_forcewake);
> }
>-- 
>2.1.3
>

Actions: View | Splinter Review

Attachments on bug 86626: 109896 | 109897 | 110513 | 110514 | 110515 | 110605

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.