From: Greg Kroah-Hartman Date: Mon, 25 Nov 2019 18:07:35 +0000 (+0100) Subject: drop amdgpu patch from 4.4 X-Git-Tag: v4.4.204~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21d10a415461d1c0f751acf3ada0fd2613931837;p=thirdparty%2Fkernel%2Fstable-queue.git drop amdgpu patch from 4.4 --- diff --git a/queue-4.4/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch b/queue-4.4/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch deleted file mode 100644 index 1f4c7671ada..00000000000 --- a/queue-4.4/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c57040d333c6729ce99c2cb95061045ff84c89ea Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Thu, 14 Nov 2019 11:39:05 -0500 -Subject: drm/amdgpu: disable gfxoff when using register read interface - -From: Alex Deucher - -commit c57040d333c6729ce99c2cb95061045ff84c89ea upstream. - -When gfxoff is enabled, accessing gfx registers via MMIO -can lead to a hang. - -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205497 -Acked-by: Xiaojie Yuan -Reviewed-by: Evan Quan -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -@@ -414,15 +414,19 @@ static int amdgpu_info_ioctl(struct drm_ - return -ENOMEM; - alloc_size = info->read_mmr_reg.count * sizeof(*regs); - -- for (i = 0; i < info->read_mmr_reg.count; i++) -+ amdgpu_gfx_off_ctrl(adev, false); -+ for (i = 0; i < info->read_mmr_reg.count; i++) { - if (amdgpu_asic_read_register(adev, se_num, sh_num, - info->read_mmr_reg.dword_offset + i, - ®s[i])) { - DRM_DEBUG_KMS("unallowed offset %#x\n", - info->read_mmr_reg.dword_offset + i); - kfree(regs); -+ amdgpu_gfx_off_ctrl(adev, true); - return -EFAULT; - } -+ } -+ amdgpu_gfx_off_ctrl(adev, true); - n = copy_to_user(out, regs, min(size, alloc_size)); - kfree(regs); - return n ? -EFAULT : 0; diff --git a/queue-4.4/series b/queue-4.4/series index 82174bd3003..8bd6ac28ce1 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -4,4 +4,3 @@ net-sched-act_pedit-fix-warn-in-the-traffic-path.patch net-rtnetlink-prevent-underflows-in-do_setvfinfo.patch revert-fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry.patch mm-ksm.c-don-t-warn-if-page-is-still-mapped-in-remove_stable_node.patch -drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch