Commit 28d6ccce authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915/selftests: Add tests for GT and engine workaround verification 



Two simple selftests which test that both GT and engine workarounds are
not lost after either a full GPU reset, or after the per-engine ones.

(Including checks that one engine reset is not affecting workarounds not
belonging to itself.)

v2:
 * Rebase for series refactoring.
 * Add spinner for actual engine reset!
 * Add idle reset test as well. (Chris Wilson)
 * Share existing global_reset_lock. (Chris Wilson)

v3:
 * intel_engine_verify_workarounds can be static.
 * API rename. (Chris Wilson)
 * Move global reset lock out of the loop. (Chris Wilson)

v4:
 * Add missing rpm puts. (Chris Wilson)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20181203125014.3219-5-tvrtko.ursulin@linux.intel.com
parent 094304be

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ 
	selftests/i915_random.o \

	selftests/i915_selftest.o \

	selftests/igt_flush_test.o \

	selftests/igt_reset.o \

	selftests/igt_spinner.o



# virtual gpu code

drivers/gpu/drm/i915/intel_workarounds.c

+6 −0
Original line number Diff line number Diff line
@@ -1303,5 +1303,11 @@ void intel_engine_apply_workarounds(struct intel_engine_cs *engine) 
}



#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)

static bool intel_engine_verify_workarounds(struct intel_engine_cs *engine,

					    const char *from)

{

	return wa_list_verify(engine->i915, &engine->wa_list, from);

}



#include "selftests/intel_workarounds.c"

#endif

drivers/gpu/drm/i915/selftests/igt_reset.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: MIT

 *

 * Copyright © 2018 Intel Corporation

 */



#include "igt_reset.h"



#include "../i915_drv.h"

#include "../intel_ringbuffer.h"



void igt_global_reset_lock(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	pr_debug("%s: current gpu_error=%08lx\n",

		 __func__, i915->gpu_error.flags);



	while (test_and_set_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags))

		wait_event(i915->gpu_error.reset_queue,

			   !test_bit(I915_RESET_BACKOFF,

				     &i915->gpu_error.flags));



	for_each_engine(engine, i915, id) {

		while (test_and_set_bit(I915_RESET_ENGINE + id,

					&i915->gpu_error.flags))

			wait_on_bit(&i915->gpu_error.flags,

				    I915_RESET_ENGINE + id,

				    TASK_UNINTERRUPTIBLE);

	}

}



void igt_global_reset_unlock(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	for_each_engine(engine, i915, id)

		clear_bit(I915_RESET_ENGINE + id, &i915->gpu_error.flags);



	clear_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags);

	wake_up_all(&i915->gpu_error.reset_queue);

}

drivers/gpu/drm/i915/selftests/igt_reset.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: MIT

 *

 * Copyright © 2018 Intel Corporation

 */



#ifndef __I915_SELFTESTS_IGT_RESET_H__

#define __I915_SELFTESTS_IGT_RESET_H__



#include "../i915_drv.h"



void igt_global_reset_lock(struct drm_i915_private *i915);

void igt_global_reset_unlock(struct drm_i915_private *i915);



#endif

drivers/gpu/drm/i915/selftests/intel_hangcheck.c

+9 −42
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "../i915_selftest.h"

#include "i915_random.h"

#include "igt_flush_test.h"

#include "igt_reset.h"

#include "igt_wedge_me.h"



#include "mock_context.h"
@@ -354,40 +355,6 @@ unlock: 
	return err;

}



static void global_reset_lock(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	pr_debug("%s: current gpu_error=%08lx\n",

		 __func__, i915->gpu_error.flags);



	while (test_and_set_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags))

		wait_event(i915->gpu_error.reset_queue,

			   !test_bit(I915_RESET_BACKOFF,

				     &i915->gpu_error.flags));



	for_each_engine(engine, i915, id) {

		while (test_and_set_bit(I915_RESET_ENGINE + id,

					&i915->gpu_error.flags))

			wait_on_bit(&i915->gpu_error.flags,

				    I915_RESET_ENGINE + id,

				    TASK_UNINTERRUPTIBLE);

	}

}



static void global_reset_unlock(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	for_each_engine(engine, i915, id)

		clear_bit(I915_RESET_ENGINE + id, &i915->gpu_error.flags);



	clear_bit(I915_RESET_BACKOFF, &i915->gpu_error.flags);

	wake_up_all(&i915->gpu_error.reset_queue);

}



static int igt_global_reset(void *arg)

{

	struct drm_i915_private *i915 = arg;
@@ -396,7 +363,7 @@ static int igt_global_reset(void *arg) 


	/* Check that we can issue a global GPU reset */



	global_reset_lock(i915);

	igt_global_reset_lock(i915);

	set_bit(I915_RESET_HANDOFF, &i915->gpu_error.flags);



	mutex_lock(&i915->drm.struct_mutex);
@@ -411,7 +378,7 @@ static int igt_global_reset(void *arg) 
	mutex_unlock(&i915->drm.struct_mutex);



	GEM_BUG_ON(test_bit(I915_RESET_HANDOFF, &i915->gpu_error.flags));

	global_reset_unlock(i915);

	igt_global_reset_unlock(i915);



	if (i915_terminally_wedged(&i915->gpu_error))

		err = -EIO;
@@ -942,7 +909,7 @@ static int igt_reset_wait(void *arg) 


	/* Check that we detect a stuck waiter and issue a reset */



	global_reset_lock(i915);

	igt_global_reset_lock(i915);



	mutex_lock(&i915->drm.struct_mutex);

	err = hang_init(&h, i915);
@@ -994,7 +961,7 @@ fini: 
	hang_fini(&h);

unlock:

	mutex_unlock(&i915->drm.struct_mutex);

	global_reset_unlock(i915);

	igt_global_reset_unlock(i915);



	if (i915_terminally_wedged(&i915->gpu_error))

		return -EIO;
@@ -1072,7 +1039,7 @@ static int __igt_reset_evict_vma(struct drm_i915_private *i915, 


	/* Check that we can recover an unbind stuck on a hanging request */



	global_reset_lock(i915);

	igt_global_reset_lock(i915);



	mutex_lock(&i915->drm.struct_mutex);

	err = hang_init(&h, i915);
@@ -1192,7 +1159,7 @@ fini: 
	hang_fini(&h);

unlock:

	mutex_unlock(&i915->drm.struct_mutex);

	global_reset_unlock(i915);

	igt_global_reset_unlock(i915);



	if (i915_terminally_wedged(&i915->gpu_error))

		return -EIO;
@@ -1272,7 +1239,7 @@ static int igt_reset_queue(void *arg) 


	/* Check that we replay pending requests following a hang */



	global_reset_lock(i915);

	igt_global_reset_lock(i915);



	mutex_lock(&i915->drm.struct_mutex);

	err = hang_init(&h, i915);
@@ -1403,7 +1370,7 @@ fini: 
	hang_fini(&h);

unlock:

	mutex_unlock(&i915->drm.struct_mutex);

	global_reset_unlock(i915);

	igt_global_reset_unlock(i915);



	if (i915_terminally_wedged(&i915->gpu_error))

		return -EIO;

CRA Git | Maintained and supported by SUSTech CRA and CCSE