OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

winsys/amdgpu: terminate process on CS rejection when unrobust context is lost

Browse Source 
We agreed on this with the kernel team as the most graceful way to deal
with this scenario.

Remove the allow_context_lost use because it's always true there
if num_rejected_cs is true.

Reviewed-by: Mihai Preda <mhpreda@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17968>
This commit is contained in:
Marek Olšák
2022-08-09 17:04:47 -04:00
committed by Marge Bot
parent 801a840a5c
commit 6d6da5bf4d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
View File

@@ -1489,7 +1489,7 @@ static void amdgpu_cs_submit_ib(void *job, void *gdata, int thread_index)
bool noop = false;
if (acs->allow_context_lost && acs->ctx->num_rejected_cs) {
if (acs->ctx->num_rejected_cs) {
r = -ECANCELED;
} else {
struct drm_amdgpu_cs_chunk chunks[7];
@@ -1632,6 +1632,16 @@ static void amdgpu_cs_submit_ib(void *job, void *gdata, int thread_index)
}
if (r) {
if (!acs->allow_context_lost) {
/* Non-robust contexts are allowed to terminate the process. The only alternative is
* to skip command submission, which would look like a freeze because nothing is drawn,
* which is not a useful state to be in under any circumstances.
*/
fprintf(stderr, "amdgpu: The CS has been rejected (%i), but the context isn't robust.\n", r);
fprintf(stderr, "amdgpu: The process will be terminated.\n");
exit(1);
}
if (r == -ECANCELED)
fprintf(stderr, "amdgpu: The CS has been cancelled because the context is lost.\n");
else