diff options
| author | Pierre-Eric Pelloux-Prayer <[email protected]> | 2023-04-24 17:25:32 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2023-06-09 13:20:55 +0000 |
| commit | 489763af891d5dc35c0b64e18af284d6591286cf (patch) | |
| tree | deea28a36bd44f86cb9c3b242bb43e12638037ac /drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | |
| parent | drm/amd/display: Fix a test dml32_rq_dlg_get_rq_reg() (diff) | |
| download | kernel-489763af891d5dc35c0b64e18af284d6591286cf.tar.gz kernel-489763af891d5dc35c0b64e18af284d6591286cf.zip | |
drm/amdgpu: add new flag to AMDGPU_CTX_QUERY2
OpenGL EXT_robustness extension expects the driver to stop reporting
GUILTY_CONTEXT_RESET when the reset has completed and the GPU is ready
to accept submission again.
This commit adds a AMDGPU_CTX_QUERY2_FLAGS_RESET_IN_PROGRESS flag,
that let the UMD know that the reset is still not finished.
Mesa MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22290
Reviewed-by: Christian König <[email protected]>
Reviewed-by: André Almeida <[email protected]>
Signed-off-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index d2139ac12159..e1f642a3dc2f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -576,6 +576,9 @@ static int amdgpu_ctx_query2(struct amdgpu_device *adev, if (atomic_read(&ctx->guilty)) out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_GUILTY; + if (amdgpu_in_reset(adev)) + out->state.flags |= AMDGPU_CTX_QUERY2_FLAGS_RESET_IN_PROGRESS; + if (adev->ras_enabled && con) { /* Return the cached values in O(1), * and schedule delayed work to cache |