From 92f039ed1c68a6f4000eddf4a4ad669bf8f9c0f1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 25 Nov 2019 19:10:48 +0100 Subject: [PATCH] drop amdgpu patch from 4.9, 4.14, and 4.19 --- ...f-when-using-register-read-interface.patch | 46 ------------------- queue-4.14/series | 1 - ...f-when-using-register-read-interface.patch | 46 ------------------- queue-4.19/series | 1 - ...f-when-using-register-read-interface.patch | 46 ------------------- queue-4.9/series | 1 - 6 files changed, 141 deletions(-) delete mode 100644 queue-4.14/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch delete mode 100644 queue-4.19/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch delete mode 100644 queue-4.9/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch diff --git a/queue-4.14/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch b/queue-4.14/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch deleted file mode 100644 index 24e78274917..00000000000 --- a/queue-4.14/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 -@@ -513,15 +513,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.14/series b/queue-4.14/series index de15eb6e373..c5359f770a4 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -11,5 +11,4 @@ nbd-fix-memory-leak-in-nbd_get_socket.patch virtio_console-allocate-inbufs-in-add_port-only-if-it-is-needed.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 drm-i915-userptr-try-to-acquire-the-page-lock-around-set_page_dirty.patch diff --git a/queue-4.19/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch b/queue-4.19/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch deleted file mode 100644 index bd659bee0a6..00000000000 --- a/queue-4.19/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 -@@ -535,15 +535,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.19/series b/queue-4.19/series index fd258304702..9bee467e91c 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -15,7 +15,6 @@ nbd-fix-memory-leak-in-nbd_get_socket.patch virtio_console-allocate-inbufs-in-add_port-only-if-it-is-needed.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 drm-amd-powerplay-issue-no-ppsmc_msg_getcurrpkgpwr-on-unsupported-asics.patch drm-i915-pmu-frequency-is-reported-as-accumulated-cycles.patch drm-i915-userptr-try-to-acquire-the-page-lock-around-set_page_dirty.patch diff --git a/queue-4.9/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch b/queue-4.9/drm-amdgpu-disable-gfxoff-when-using-register-read-interface.patch deleted file mode 100644 index 018ca0b4278..00000000000 --- a/queue-4.9/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 -@@ -438,15 +438,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.9/series b/queue-4.9/series index 93b964a215b..64dba651e97 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -7,4 +7,3 @@ gpio-max77620-fixup-debounce-delays.patch tools-gpio-correctly-add-make-dependencies-for-gpio_utils.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 -- 2.47.3