[PATCH 1/5] drm/i915/selftests: Show the complete set of results for whitelist write fail

Chris Wilson chris at chris-wilson.co.uk
Fri Jun 21 16:43:33 UTC 2019


If we fail to write into the register, show the complete set of results
to aide debugging.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/selftest_workarounds.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index f12cb20fe785..a0782a2997d0 100644
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -587,8 +587,7 @@ static int check_dirty_whitelist(struct i915_gem_context *ctx,
 		if (!rsvd) {
 			pr_err("%s: Unable to write to whitelisted register %x\n",
 			       engine->name, reg);
-			err = -EINVAL;
-			goto out_unpin;
+			goto err_show;
 		}
 
 		expect = results[0];
@@ -608,7 +607,7 @@ static int check_dirty_whitelist(struct i915_gem_context *ctx,
 		if (err) {
 			pr_err("%s: %d mismatch between values written to whitelisted register [%x], and values read back!\n",
 			       engine->name, err, reg);
-
+err_show:
 			pr_info("%s: Whitelisted register: %x, original value %08x, rsvd %08x\n",
 				engine->name, reg, results[0], rsvd);
 
@@ -633,7 +632,6 @@ static int check_dirty_whitelist(struct i915_gem_context *ctx,
 
 			err = -EINVAL;
 		}
-out_unpin:
 		i915_gem_object_unpin_map(scratch->obj);
 		if (err)
 			break;
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list