diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0931-drm-amdgpu-fix-s4-resume.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0931-drm-amdgpu-fix-s4-resume.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/common/recipes-kernel/linux/files/0931-drm-amdgpu-fix-s4-resume.patch b/common/recipes-kernel/linux/files/0931-drm-amdgpu-fix-s4-resume.patch deleted file mode 100644 index cff6a671..00000000 --- a/common/recipes-kernel/linux/files/0931-drm-amdgpu-fix-s4-resume.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 94463967db5d977cc647323b1fc9761bb0ad5da2 Mon Sep 17 00:00:00 2001 -From: Flora Cui <Flora.Cui@amd.com> -Date: Thu, 4 Feb 2016 15:10:08 +0800 -Subject: [PATCH 0931/1565] drm/amdgpu: fix s4 resume - -No need to re-init asic if it's already been initialized. -Skip IB tests since kernel processes are frozen in thaw. - -Signed-off-by: Flora Cui <Flora.Cui@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Cc: stable@vger.kernel.org ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index 85991ce..51bfc11 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -1795,15 +1795,20 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) - } - - /* post card */ -- amdgpu_atom_asic_init(adev->mode_info.atom_context); -+ if (!amdgpu_card_posted(adev)) -+ amdgpu_atom_asic_init(adev->mode_info.atom_context); - - r = amdgpu_resume(adev); -+ if (r) -+ DRM_ERROR("amdgpu_resume failed (%d).\n", r); - - amdgpu_fence_driver_resume(adev); - -- r = amdgpu_ib_ring_tests(adev); -- if (r) -- DRM_ERROR("ib ring test failed (%d).\n", r); -+ if (resume) { -+ r = amdgpu_ib_ring_tests(adev); -+ if (r) -+ DRM_ERROR("ib ring test failed (%d).\n", r); -+ } - - r = amdgpu_late_init(adev); - if (r) --- -1.9.1 - |