Skip to content

Revert "mesa: use simple_mtx_t for TexMutex"

Faith Ekstrand requested to merge gfxstrand/mesa:review/unbrick-i965 into main

This reverts the following commit from main:

commit f6abb3445b7f244c0243f03bd7cf1e7ad1e2f1ab
Author: Marek Olšák <maraeo@gmail.com>
Date:   Fri Oct 1 15:46:48 2021 -0400

    mesa: use simple_mtx_t for TexMutex

    change mtx_recursive -> mtx_plain, there's no recursive locking

    Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
    Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
    Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13152>

Contrary to the claim in the commit message, there is recursive locking. The meta stuff used by i965 does GL operations while the texture is locked. If we don't allow recursive locks, it will deadlock. No, it's not great, but it's the current state of affairs. Once we delete i965 in favor of crocus and any other users of meta, we can restore the above patch. Until then, we need mtx_recursive.

Merge request reports