diff options
| author | Lucas De Marchi <[email protected]> | 2025-03-14 13:48:58 +0000 |
|---|---|---|
| committer | Lucas De Marchi <[email protected]> | 2025-03-26 03:54:59 +0000 |
| commit | caf2f15648ba6cb4c329465c5686c9864a081a71 (patch) | |
| tree | 8632f8752d69250e9be047fa01339367192262ba /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
| parent | drm/xe: Apply Wa_16023105232 (diff) | |
| download | kernel-caf2f15648ba6cb4c329465c5686c9864a081a71.tar.gz kernel-caf2f15648ba6cb4c329465c5686c9864a081a71.zip | |
drm/xe: Move survivability back to xe
Commit d40f275d96e8 ("drm/xe: Move survivability entirely to xe_pci")
moved the survivability handling to be done entirely in the xe_pci
layer. However there are some issues with that approach:
1) Survivability mode needs at least the mmio initialized, otherwise it
can't really read a register to decide if it should enter that state
2) SR-IOV mode should be initialized, otherwise it's not possible to
check if it's VF
Besides, as pointed by Riana the check for
xe_survivability_mode_enable() was wrong in xe_pci_probe() since it's
not a bool return.
Fix that by moving the initialization to be entirely in the xe_device
layer, with the correct dependencies handled: only after mmio and sriov
initialization, and not triggering it on error from
wait_for_lmem_ready(). This restores the trigger behavior before that
commit. The xe_pci layer now only checks for "is it enabled?",
like it's doing in xe_pci_suspend()/xe_pci_remove(), etc.
Cc: Riana Tauro <[email protected]>
Fixes: d40f275d96e8 ("drm/xe: Move survivability entirely to xe_pci")
Reviewed-by: Riana Tauro <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Lucas De Marchi <[email protected]>
(cherry picked from commit 86b5e0dbba07438de91dd81095464c6c4aa7a372)
Signed-off-by: Lucas De Marchi <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
0 files changed, 0 insertions, 0 deletions
