| Message ID | 9379466.CDJkKcVGEf@devpool47.emlix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | annotate i915_gem_object_trylock() as __must_check | expand |
diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c index ca460cee4f8b..b2cb501febe8 100644 --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c @@ -822,7 +822,10 @@ create_init_lmem_internal(struct intel_gt *gt, size_t sz, bool try_lmem) return obj; } - i915_gem_object_trylock(obj, NULL); + if (!i915_gem_object_trylock(obj, NULL)) { + i915_gem_object_put(obj); + return ERR_PTR(-EBUSY); + } err = i915_gem_object_pin_pages(obj); if (err) { i915_gem_object_unlock(obj);
A trylock can fail, in which case operating on the object is unsafe and unconditionally unlocking is wrong. Signed-off-by: Rolf Eike Beer <eb@emlix.com> --- drivers/gpu/drm/i915/gt/selftest_migrate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)