summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2023-06-20 02:28:17 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2023-06-20 02:28:17 +0000
commit3e82e61615d1d9164235e96a1ce9f54825538350 (patch)
tree4a773825f7c90e519973bdc11d506a4482bfe6ee /sys
parent159ee731f33762fcb33f8291eec6205809d2b1ec (diff)
drm/i915/selftests: Add some missing error propagation
From Tvrtko Ursulin 76eef453a675794e98400c8889446b1503a9dfa6 in linux-6.1.y/6.1.34 79d0150d2d983a4f6efee676cea06027f586fcd0 in mainline linux
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/i915/gem/selftests/i915_gem_context.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/i915/gem/selftests/i915_gem_context.c b/sys/dev/pci/drm/i915/gem/selftests/i915_gem_context.c
index ca75acbd847..958d465c84d 100644
--- a/sys/dev/pci/drm/i915/gem/selftests/i915_gem_context.c
+++ b/sys/dev/pci/drm/i915/gem/selftests/i915_gem_context.c
@@ -346,8 +346,10 @@ static int live_parallel_switch(void *arg)
continue;
ce = intel_context_create(data[m].ce[0]->engine);
- if (IS_ERR(ce))
+ if (IS_ERR(ce)) {
+ err = PTR_ERR(ce);
goto out;
+ }
err = intel_context_pin(ce);
if (err) {
@@ -367,8 +369,10 @@ static int live_parallel_switch(void *arg)
worker = kthread_create_worker(0, "igt/parallel:%s",
data[n].ce[0]->engine->name);
- if (IS_ERR(worker))
+ if (IS_ERR(worker)) {
+ err = PTR_ERR(worker);
goto out;
+ }
data[n].worker = worker;
}
@@ -397,8 +401,10 @@ static int live_parallel_switch(void *arg)
}
}
- if (igt_live_test_end(&t))
- err = -EIO;
+ if (igt_live_test_end(&t)) {
+ err = err ?: -EIO;
+ break;
+ }
}
out: