提交 a9fe43e6 编写于 作者: J Janusz Krzysztofik 提交者: sanglipeng

drm/i915: Never return 0 if not all requests retired

stable inclusion
from stable-v5.10.158
commit 648b92e5760721fbf230e242950182d7e9222143
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7NTXH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=648b92e5760721fbf230e242950182d7e9222143

--------------------------------

commit 12b8b046 upstream.

Users of intel_gt_retire_requests_timeout() expect 0 return value on
success.  However, we have no protection from passing back 0 potentially
returned by a call to dma_fence_wait_timeout() when it succedes right
after its timeout has expired.

Replace 0 with -ETIME before potentially using the timeout value as return
code, so -ETIME is returned if there are still some requests not retired
after timeout, 0 otherwise.

v3: Use conditional expression, more compact but also better reflecting
    intention standing behind the change.

v2: Move the added lines down so flush_submission() is not affected.

Fixes: f33a8a51 ("drm/i915: Merge wait_for_timelines with retire_request")
Signed-off-by: NJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: NAndrzej Hajda <andrzej.hajda@intel.com>
Cc: stable@vger.kernel.org # v5.5+
Signed-off-by: NTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221121145655.75141-3-janusz.krzysztofik@linux.intel.com
(cherry picked from commit f301a29f)
Signed-off-by: NTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 4795f314
...@@ -200,7 +200,7 @@ out_active: spin_lock(&timelines->lock); ...@@ -200,7 +200,7 @@ out_active: spin_lock(&timelines->lock);
if (flush_submission(gt, timeout)) /* Wait, there's more! */ if (flush_submission(gt, timeout)) /* Wait, there's more! */
active_count++; active_count++;
return active_count ? timeout : 0; return active_count ? timeout ?: -ETIME : 0;
} }
int intel_gt_wait_for_idle(struct intel_gt *gt, long timeout) int intel_gt_wait_for_idle(struct intel_gt *gt, long timeout)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册