From: jsg Date: Mon, 9 Jan 2023 03:59:28 +0000 (+0000) Subject: drm/amdgpu: skip MES for S0ix as well since it's part of GFX X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7a1b9fa9e0d0b7e9be2cd866ef98029065fb6805;p=openbsd drm/amdgpu: skip MES for S0ix as well since it's part of GFX From Alex Deucher 33a3b7fad8273e7bcbef0f456c2070be8adcad45 in linux-6.1.y/6.1.4 afa6646b1c5d3affd541f76bd7476e4b835a9174 in mainline linux --- diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c index 7ddc4e40032..702c907ce2e 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c @@ -3037,14 +3037,15 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) continue; } - /* skip suspend of gfx and psp for S0ix + /* skip suspend of gfx/mes and psp for S0ix * gfx is in gfxoff state, so on resume it will exit gfxoff just * like at runtime. PSP is also part of the always on hardware * so no need to suspend it. */ if (adev->in_s0ix && (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP || - adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX)) + adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX || + adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_MES)) continue; /* XXX handle errors */