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

radv/amdgpu: only set a new pstate if the current one is different

Browse source 
AMDGPU pstate is per context but if there is multiple AMDGPU contexts
in flight, the kernel can return -EBUSY.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21222>
(cherry picked from commit 6d73841d34)
This commit is contained in:
Samuel Pitoiset 2023-02-09 16:07:56 +01:00 • committed by Eric Engestrom
parent 2029f4bd30
commit 35d330ed89
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1858,7 +1858,7 @@
"description": "radv/amdgpu: only set a new pstate if the current one is different",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

25
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
View file

@ -1639,8 +1639,29 @@ static int
radv_amdgpu_ctx_set_pstate(struct radeon_winsys_ctx *rwctx, enum radeon_ctx_pstate pstate)
{
struct radv_amdgpu_ctx *ctx = (struct radv_amdgpu_ctx *)rwctx;
uint32_t amdgpu_pstate = radv_to_amdgpu_pstate(pstate);
return amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_SET_STABLE_PSTATE, amdgpu_pstate, NULL);
uint32_t new_pstate = radv_to_amdgpu_pstate(pstate);
uint32_t current_pstate = 0;
int r;
r = amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_GET_STABLE_PSTATE, 0, &current_pstate);
if (r) {
fprintf(stderr, "radv/amdgpu: failed to get current pstate\n");
return r;
}
/* Do not try to set a new pstate when the current one is already what we want. Otherwise, the
* kernel might return -EBUSY if we have multiple AMDGPU contexts in flight.
*/
if (current_pstate == new_pstate)
return 0;
r = amdgpu_cs_ctx_stable_pstate(ctx->ctx, AMDGPU_CTX_OP_SET_STABLE_PSTATE, new_pstate, NULL);
if (r) {
fprintf(stderr, "radv/amdgpu: failed to set new pstate\n");
return r;
}
return 0;
}
static void *