diff options
author | Dave Airlie <airlied@redhat.com> | 2023-10-31 12:36:55 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-10-31 12:37:19 +1000 |
commit | 631808095a82e6b6f8410a95f8b12b8d0d38b161 (patch) | |
tree | dfd7a137cab23f6577fe39aa071255cf064662b3 /drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | |
parent | Merge tag 'drm-misc-next-2023-10-27' of git://anongit.freedesktop.org/drm/drm... (diff) | |
parent | drm/amdgpu: Remove unused variables from amdgpu_show_fdinfo (diff) | |
download | linux-631808095a82e6b6f8410a95f8b12b8d0d38b161.tar.gz linux-631808095a82e6b6f8410a95f8b12b8d0d38b161.tar.bz2 linux-631808095a82e6b6f8410a95f8b12b8d0d38b161.zip |
Merge tag 'amd-drm-next-6.7-2023-10-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.7-2023-10-27:
amdgpu:
- RAS fixes
- Seamless boot fixes
- NBIO 7.7 fix
- SMU 14.0 fixes
- GC 11.5 fixes
- DML2 fixes
- ASPM fixes
- VPE fixes
- Misc code cleanups
- SRIOV fixes
- Add some missing copyright notices
- DCN 3.5 fixes
- FAMS fixes
- Backlight fix
- S/G display fix
- fdinfo cleanups
- EXT_COHERENT fixes for APU and NUMA systems
amdkfd:
- Misc fixes
- Misc code cleanups
- SVM fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231027200343.57132-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c index 19eaada35ede..4713a62ad586 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c @@ -73,7 +73,8 @@ gmc_v11_0_vm_fault_interrupt_state(struct amdgpu_device *adev, * fini/suspend, so the overall state doesn't * change over the course of suspend/resume. */ - if (!adev->in_s0ix) + if (!adev->in_s0ix && (adev->in_runpm || adev->in_suspend || + amdgpu_in_reset(adev))) amdgpu_gmc_set_vm_fault_masks(adev, AMDGPU_GFXHUB(0), false); break; case AMDGPU_IRQ_STATE_ENABLE: |