From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 9 May 2019 00:13:46 +0000 (-0400)
Subject: winsys/amdgpu: report a CS rejection as a reset only if there's no GPU reset
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b3343e5d80abf162b45f0d7e977449588824706;p=mesa.git

winsys/amdgpu: report a CS rejection as a reset only if there's no GPU reset
---

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 555150a7018..955edb3a670 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -352,12 +352,6 @@ amdgpu_ctx_query_reset_status(struct radeon_winsys_ctx *rwctx)
    uint32_t result, hangs;
    int r;
 
-   /* Return a failure due to a rejected command submission. */
-   if (ctx->ws->num_total_rejected_cs > ctx->initial_num_total_rejected_cs) {
-      return ctx->num_rejected_cs ? PIPE_GUILTY_CONTEXT_RESET :
-                                    PIPE_INNOCENT_CONTEXT_RESET;
-   }
-
    /* Return a failure due to a GPU hang. */
    r = amdgpu_cs_query_reset_state(ctx->ctx, &result, &hangs);
    if (r) {
@@ -374,6 +368,11 @@ amdgpu_ctx_query_reset_status(struct radeon_winsys_ctx *rwctx)
       return PIPE_UNKNOWN_CONTEXT_RESET;
    case AMDGPU_CTX_NO_RESET:
    default:
+      /* Return a failure due to a rejected command submission. */
+      if (ctx->ws->num_total_rejected_cs > ctx->initial_num_total_rejected_cs) {
+         return ctx->num_rejected_cs ? PIPE_GUILTY_CONTEXT_RESET :
+                                       PIPE_INNOCENT_CONTEXT_RESET;
+      }
       return PIPE_NO_RESET;
    }
 }