1 files changed, 41 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index c184468e2b2b..d71dc164b469 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -75,6 +75,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
         }
 
         ctx->reset_counter = atomic_read(&adev->gpu_reset_counter);
+        ctx->reset_counter_query = ctx->reset_counter;
         ctx->vram_lost_counter = atomic_read(&adev->vram_lost_counter);
         ctx->init_priority = priority;
         ctx->override_priority = AMD_SCHED_PRIORITY_UNSET;
@@ -90,7 +91,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
                         continue;
 
                 r = amd_sched_entity_init(&ring->sched, &ctx->rings[i].entity,
-                                          rq, amdgpu_sched_jobs);
+                                          rq, amdgpu_sched_jobs, &ctx->guilty);
                 if (r)
                         goto failed;
         }
@@ -216,11 +217,45 @@ static int amdgpu_ctx_query(struct amdgpu_device *adev,
         /* determine if a GPU reset has occured since the last call */
         reset_counter = atomic_read(&adev->gpu_reset_counter);
         /* TODO: this should ideally return NO, GUILTY, or INNOCENT. */
-        if (ctx->reset_counter == reset_counter)
+        if (ctx->reset_counter_query == reset_counter)
                 out->state.reset_status = AMDGPU_CTX_NO_RESET;
         else
                 out->state.reset_status = AMDGPU_CTX_UNKNOWN_RESET;
-        ctx->reset_counter = reset_counter;
+        ctx->reset_counter_query = reset_counter;
+
+        mutex_unlock(&mgr->lock);
+        return 0;
+}
+
+static int amdgpu_ctx_query2(struct amdgpu_device *adev,
+        struct amdgpu_fpriv *fpriv, uint32_t id,
+        union drm_amdgpu_ctx_out *out)
+{
+        struct amdgpu_ctx *ctx;
+        struct amdgpu_ctx_mgr *mgr;
+
+        if (!fpriv)
+                return -EINVAL;
+
+        mgr = &fpriv->ctx_mgr;
+        mutex_lock(&mgr->lock);
+        ctx = idr_find(&mgr->ctx_handles, id);
+        if (!ctx) {
+                mutex_unlock(&mgr->lock);
+                return -EINVAL;
+        }
+
+        out->state.flags = 0x0;
+        out->state.hangs = 0x0;
+
+        if (ctx->reset_counter != atomic_read(&adev->gpu_reset_counter))
+                out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_RESET;
+
+        if (ctx->vram_lost_counter != atomic_read(&adev->vram_lost_counter))
+                out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_VRAMLOST;
+
+        if (atomic_read(&ctx->guilty))
+                out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_GUILTY;
 
         mutex_unlock(&mgr->lock);
         return 0;
@@ -257,6 +292,9 @@ int amdgpu_ctx_ioctl(struct drm_device *dev, void *data,
         case AMDGPU_CTX_OP_QUERY_STATE:
                 r = amdgpu_ctx_query(adev, fpriv, id, &args->out);
                 break;
+        case AMDGPU_CTX_OP_QUERY_STATE2:
+                r = amdgpu_ctx_query2(adev, fpriv, id, &args->out);
+                break;
         default:
                 return -EINVAL;
         }