diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-03 15:44:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-03 15:44:49 +0100 |
| commit | 4dac529c9a2c0ed1286801ec62d23538035a3a1d (patch) | |
| tree | c99335269438629bc089c9895e6156cf9a374a22 /drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | |
| parent | 5a42c9f18870162ae14f0d8e193671017421a982 (diff) | |
| parent | 50be7c9b5d5ea55fd40bb411cf324cec99ec7417 (diff) | |
| download | linux-next-4dac529c9a2c0ed1286801ec62d23538035a3a1d.tar.gz linux-next-4dac529c9a2c0ed1286801ec62d23538035a3a1d.zip | |
Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
# drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
# drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Diffstat (limited to 'drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c index 0ac35789b239..acbdca91cde5 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c @@ -1040,7 +1040,13 @@ int kfd_criu_restore_queue(struct kfd_process *p, ctl_stack = mqd + q_data->mqd_size; memset(&qp, 0, sizeof(qp)); - set_queue_properties_from_criu(&qp, q_data, NUM_XCC(pdd->dev->adev->gfx.xcc_mask)); + set_queue_properties_from_criu(&qp, q_data, NUM_XCC(pdd->dev->xcc_mask)); + + ret = kfd_queue_acquire_buffers(pdd, &qp); + if (ret) { + pr_debug("failed to acquire user queue buffers for CRIU\n"); + goto exit; + } ret = kfd_queue_acquire_buffers(pdd, &qp); if (ret) { |