venus: revert back the warn order

This reverts
- commit 4ae4e4362c
- commit f54aa49c14

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21542>
This commit is contained in:
Yiwei Zhang 2023-02-09 22:08:10 -08:00 committed by Marge Bot
parent 28bdf8db18
commit ae6eb3229e

View file

@ -130,9 +130,9 @@ vn_relax(const struct vn_ring *ring, uint32_t *iter, const char *reason)
* base_sleep_us microseconds for the same number of times. After that,
* keep doubling both sleep length and count.
*/
const uint32_t busy_wait_order = 10;
const uint32_t busy_wait_order = 8;
const uint32_t base_sleep_us = vn_env.relax_base_sleep_us;
const uint32_t warn_order = 14;
const uint32_t warn_order = 12;
const uint32_t abort_order = 16;
(*iter)++;
@ -141,8 +141,8 @@ vn_relax(const struct vn_ring *ring, uint32_t *iter, const char *reason)
return;
}
/* warn occasionally if we have slept at least 1.28ms for 8192 times (plus
* another 8191 shorter sleeps)
/* warn occasionally if we have slept at least 1.28ms for 2048 times (plus
* another 2047 shorter sleeps)
*/
if (unlikely(*iter % (1 << warn_order) == 0)) {
vn_log(NULL, "stuck in %s wait with iter at %d", reason, *iter);