2023-01-13 11:55:59 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
|
|
|
|
|
Date: Thu, 29 Dec 2022 14:01:31 +0800
|
|
|
|
|
Subject: [PATCH] Revert "iris: Avoid abort() if kernel can't allocate memory"
|
2023-03-21 23:28:08 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
2023-01-13 11:55:59 +00:00
|
|
|
|
|
|
|
|
This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92.
|
|
|
|
|
|
|
|
|
|
Now ENOMEM is handled in submit_batch(), we don't need to check it for
|
|
|
|
|
resetting anymore.
|
|
|
|
|
|
2023-03-21 23:28:08 +00:00
|
|
|
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
|
|
|
|
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
|
2023-01-13 11:55:59 +00:00
|
|
|
---
|
|
|
|
|
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
|
2023-03-21 23:28:08 +00:00
|
|
|
index deab85ce4aaf..2993f0ab7ee8 100644
|
2023-01-13 11:55:59 +00:00
|
|
|
--- a/src/gallium/drivers/iris/iris_batch.c
|
|
|
|
|
+++ b/src/gallium/drivers/iris/iris_batch.c
|
2023-03-21 23:28:08 +00:00
|
|
|
@@ -1097,9 +1097,8 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line)
|
2023-01-13 11:55:59 +00:00
|
|
|
* 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) && replace_kernel_ctx(batch)) {
|
|
|
|
|
+ if (ret == -EIO && replace_kernel_ctx(batch)) {
|
|
|
|
|
if (batch->reset->reset) {
|
|
|
|
|
/* Tell gallium frontends the device is lost and it was our fault. */
|
|
|
|
|
batch->reset->reset(batch->reset->data, PIPE_GUILTY_CONTEXT_RESET);
|
