fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 13:00:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "iris: Avoid abort() if kernel can't allocate memory"

Browse source 
This reverts commit f9d8d9acbb.

Now ENOMEM is handled in submit_batch(), we don't need to check it for
resetting anymore.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21829>
This commit is contained in:
Kai-Heng Feng 2022-12-29 14:01:31 +08:00 • committed by Dylan Baker
parent f2b262feef
commit 2d4b0238fb
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -17230,7 +17230,7 @@
"description": "Revert \"iris: Avoid abort() if kernel can't allocate memory\"",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 3,
"main_sha": null,
"because_sha": "f9d8d9acbb6a620684fb4dac4affe25816587d92"
},

3
src/gallium/drivers/iris/iris_batch.c
View file

@ -1097,9 +1097,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) && 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);