diff options
| author | Jiri Kosina <[email protected]> | 2022-12-13 14:28:47 +0100 |
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2022-12-13 14:28:47 +0100 |
| commit | ab970ae1d63822228bdc84b9c1514efbd2f66da7 (patch) | |
| tree | fefc08d8dd28e4eb5465ca85de5cce2fb6f1b7ef /drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | |
| parent | cfd1f6c16f7deadfe5269a76c1516405c4466481 (diff) | |
| parent | 163a7fbff7a78c7c055e6c0ad26124ae551fe313 (diff) | |
Merge branch 'for-6.2/default-remove-cleanup' into for-linus
- removal of superfluous hid_hw_stop() calls for drivers with default
.remove callback (Marcus Folkesson)
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c index f6d9d5da53cd..d2139ac12159 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -326,7 +326,10 @@ static int amdgpu_ctx_init(struct amdgpu_ctx_mgr *mgr, int32_t priority, if (r) return r; - ctx->stable_pstate = current_stable_pstate; + if (mgr->adev->pm.stable_pstate_ctx) + ctx->stable_pstate = mgr->adev->pm.stable_pstate_ctx->stable_pstate; + else + ctx->stable_pstate = current_stable_pstate; return 0; } |