From 3d811626b07002278d45a1c550884bfc25c629aa Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 2 Mar 2022 12:58:57 +0000 Subject: [PATCH] drm/amdgpu: do not enable asic reset for raven2 From Chen Gong 8840d963e56685f8750c710b1d567a283712c554 in linux 5.15.y/5.15.26 1e2be869c8a7247a7253ef4f461f85e2f5931b95 in mainline linux --- sys/dev/pci/drm/amd/amdgpu/soc15.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/soc15.c b/sys/dev/pci/drm/amd/amdgpu/soc15.c index 7542169c70b..dcdbbdfd3e8 100644 --- a/sys/dev/pci/drm/amd/amdgpu/soc15.c +++ b/sys/dev/pci/drm/amd/amdgpu/soc15.c @@ -607,8 +607,8 @@ soc15_asic_reset_method(struct amdgpu_device *adev) static int soc15_asic_reset(struct amdgpu_device *adev) { /* original raven doesn't have full asic reset */ - if ((adev->apu_flags & AMD_APU_IS_RAVEN) && - !(adev->apu_flags & AMD_APU_IS_RAVEN2)) + if ((adev->apu_flags & AMD_APU_IS_RAVEN) || + (adev->apu_flags & AMD_APU_IS_RAVEN2)) return 0; switch (soc15_asic_reset_method(adev)) { -- 2.20.1