Module: Mesa Branch: main Commit: 646cff13bca8a92b846984d782ef00e57d34d7a1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=646cff13bca8a92b846984d782ef00e57d34d7a1
Author: Kai-Heng Feng <[email protected]> Date: Thu Dec 29 14:01:31 2022 +0800 Revert "iris: Avoid abort() if kernel can't allocate memory" This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92. Now ENOMEM is handled in submit_batch(), we don't need to check it for resetting anymore. Reviewed-by: José Roberto de Souza <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449> --- src/gallium/drivers/iris/iris_batch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 8f46bd581b2..fa5e735d950 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -1098,9 +1098,8 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line) * with a new logical context, and inform iris_context that all state * has been lost and needs to be re-initialized. If this succeeds, * dubiously claim success... - * Also handle ENOMEM here. */ - if (ret == -EIO || ret == -ENOMEM) { + if (ret == -EIO) { enum pipe_reset_status status = iris_batch_check_for_reset(batch); if (batch->reset->reset) { /* Tell gallium frontends the device is lost and it was our fault. */
