]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu: fix buffer funcs setting order on suspend
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 29 Nov 2023 20:44:25 +0000 (15:44 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 6 Dec 2023 20:22:37 +0000 (15:22 -0500)
We need to disable this after the last eviction
call, but before we disable the SDMA IP.

Fixes: b70438004a14 ("drm/amdgpu: move buffer funcs setting up a level")
Link: https://lore.kernel.org/r/87edgv4x3i.fsf@vps.thesusis.net
Reviewed-by: Luben Tuikov <ltuikov89@gmail.com>
Tested-by: Phillip Susi <phill@thesusis.net>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Phillip Susi <phill@thesusis.net>
Cc: Luben Tuikov <ltuikov89@gmail.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index d5b950fd1d85214593bac00a216175ee641dca93..138c7b37af698d73d23836966a9266eba95eadab 100644 (file)
@@ -4600,6 +4600,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
        if (r)
                return r;
 
+       amdgpu_ttm_set_buffer_funcs_status(adev, false);
+
        amdgpu_fence_driver_hw_fini(adev);
 
        amdgpu_device_ip_suspend_phase2(adev);