From 76c5399fe2e4d7a5013280629de05c8ab6301311 Mon Sep 17 00:00:00 2001

From: Chris Wilson <chris@chris-wilson.co.uk>

Date: Mon, 29 Jul 2019 09:59:44 +0100

Subject: drm/i915/selftests: Careful not to flush hang_fini on error setups

Git-commit: 76c5399fe2e4d7a5013280629de05c8ab6301311

Patch-mainline: v5.4-rc1

References: bsc#1152489

Smatch spotted that we test at the start of hang_fini for a valid (h->gt

is only set after a request is created) but then used it regardless

later on.

v2: Alternatively, we do not need to check as we now always prime h->gt

in hang_init()

References: cb823ed9915b ("drm/i915/gt: Use intel_gt as the primary object for handling resets")

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20190729085944.2179-1-chris@chris-wilson.co.uk

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 4 +---

 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c

index e2fa38a1ff0f..4484b4447db1 100644

--- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c

+++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c

@@ -272,9 +272,7 @@ static u32 hws_seqno(const struct hang *h, const struct i915_request *rq)

 static void hang_fini(struct hang *h)

 {

 	*h->batch = MI_BATCH_BUFFER_END;

-

-	if (h->gt)

-		intel_gt_chipset_flush(h->gt);

+	intel_gt_chipset_flush(h->gt);

 	i915_gem_object_unpin_map(h->obj);

 	i915_gem_object_put(h->obj);

-- 

2.28.0