openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/selftests: Check that gpu reset is usable from atomic context 

GPU reset is now available with GuC enabled, so re-enable our check that
this reset is usable from atomic context.

Signed-off-by: Fernando Pacheco <fernando.pacheco@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190419230015.18121-6-fernando.pacheco@intel.com
This commit is contained in:
Fernando Pacheco 2019-04-19 16:00:15 -07:00 committed by Chris Wilson
parent 40d211ef62
commit f3c2b76ef2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/selftests/intel_hangcheck.c
View File

@ -1814,9 +1814,6 @@ static int igt_atomic_reset(void *arg)
/* Check that the resets are usable from atomic context */
if (USES_GUC_SUBMISSION(i915))
return 0; /* guc is dead; long live the guc */
igt_global_reset_lock(i915);
mutex_lock(&i915->drm.struct_mutex);
wakeref = intel_runtime_pm_get(i915);
@ -1846,6 +1843,9 @@ static int igt_atomic_reset(void *arg)
force_reset(i915);
}
if (USES_GUC_SUBMISSION(i915))
goto unlock;
if (intel_has_reset_engine(i915)) {
struct intel_engine_cs *engine;
enum intel_engine_id id;