Skip to contentSkip to conversation

Patch "drm/i915: Just clear the mmiodebug before a register access" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 28, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915: Just clear the mmiodebug before a register access

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-just-clear-the-mmiodebug-before-a-register-access.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f856f847b22c52be82f712ea6ada946c6db884d7 Mon Sep 17 00:00:00 2001

From: Chris Wilson <[email protected]>
Date: Mon, 3 Oct 2016 13:45:14 +0100
Subject: drm/i915: Just clear the mmiodebug before a register access

From: Chris Wilson <[email protected]>

commit f856f847b22c52be82f712ea6ada946c6db884d7 upstream.

When we enable the per-register access mmiodebug, it is to detect which access is illegal. Reporting on earlier untraced access outside of the mmiodebug does not help debugging (as the suspicion is immediately put upon the current register which is not at fault)!

References: https://bugs.freedesktop.org/show_bug.cgi?id=97985

Cc Mika Kuoppala <[email protected]>
(cherry picked from commit dda960335e020835f7f1c12760e7f0b525b451e2)
---
 drivers/gpu/drm/i915/intel_uncore.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +3 -4
@@ -796,10 +796,9 @@ __unclaimed_reg_debug(struct drm_i915_pr
 		      const bool read,
 		      const bool before)
 {
-	if (WARN(check_for_unclaimed_mmio(dev_priv),
-		 "Unclaimed register detected %s %s register 0x%x\n",
-		 before ? "before" : "after",
-		 read ? "reading" : "writing to",
+	if (WARN(check_for_unclaimed_mmio(dev_priv) && !before,
+		 "Unclaimed %s register 0x%x\n",
+		 read ? "read from" : "write to",
 		 i915_mmio_reg_offset(reg)))
 		i915.mmio_debug--; /* Only report the first N failures */
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/drm-i915-unalias-obj-phys_handle-and-obj-userptr.patch queue-4.8/revert-drm-i915-check-live-status-before-reading-edid.patch queue-4.8/drm-prime-pass-the-right-module-owner-through-to-dma_buf_export.patch queue-4.8/drm-i915-account-for-tseg-size-when-determining-865g-stolen-base.patch queue-4.8/drm-i915-just-clear-the-mmiodebug-before-a-register-access.patch