4.14-stable patches

added patches:
	drm-amdgpu-always-register-an-mmu-notifier-for-userptr.patch

diff --git a/queue-4.14/drm-amdgpu-always-register-an-mmu-notifier-for-userptr.patch b/queue-4.14/drm-amdgpu-always-register-an-mmu-notifier-for-userptr.patch
new file mode 100644 (file)
index 0000000..f47fb5d
--- /dev/null
+++ b/queue-4.14/drm-amdgpu-always-register-an-mmu-notifier-for-userptr.patch
@@ -0,0 +1,42 @@
+From b39df63b16b64a3af42695acb9bc567aad144776 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Wed, 9 Nov 2022 12:14:44 +0100
+Subject: drm/amdgpu: always register an MMU notifier for userptr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Christian König <christian.koenig@amd.com>
+
+commit b39df63b16b64a3af42695acb9bc567aad144776 upstream.
+
+Since switching to HMM we always need that because we no longer grab
+references to the pages.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
+CC: stable@vger.kernel.org
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c |    8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+@@ -308,11 +308,9 @@ int amdgpu_gem_userptr_ioctl(struct drm_
+       if (r)
+               goto release_object;
+ 
+-      if (args->flags & AMDGPU_GEM_USERPTR_REGISTER) {
+-              r = amdgpu_mn_register(bo, args->addr);
+-              if (r)
+-                      goto release_object;
+-      }
++      r = amdgpu_mn_register(bo, args->addr);
++      if (r)
++              goto release_object;
+ 
+       if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) {
+               down_read(&current->mm->mmap_sem);

diff --git a/queue-4.14/net-usb-qmi_wwan-add-telit-0x103a-composition.patch b/queue-4.14/net-usb-qmi_wwan-add-telit-0x103a-composition.patch
index 050a494eb2cd2bb57c20c0a0efc3f1e3cd897003..5cffd1a6ad38c8828fdb8483b899bbfb227e342f 100644 (file)
--- a/queue-4.14/net-usb-qmi_wwan-add-telit-0x103a-composition.patch
+++ b/queue-4.14/net-usb-qmi_wwan-add-telit-0x103a-composition.patch
@@ -20,14 +20,12 @@ Link: https://lore.kernel.org/r/20221115105859.14324-1-enrico.sau@gmail.com
 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/usb/qmi_wwan.c | 1 +
+ drivers/net/usb/qmi_wwan.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
-index 66c6b7111a3a..74040db959d8 100644
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1306,6 +1306,7 @@ static const struct usb_device_id products[] = {
+@@ -1306,6 +1306,7 @@ static const struct usb_device_id produc
        {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
        {QMI_FIXED_INTF(0x2357, 0x9000, 4)},    /* TP-LINK MA260 */
        {QMI_QUIRK_SET_DTR(0x1bc7, 0x1031, 3)}, /* Telit LE910C1-EUX */
@@ -35,6 +33,3 @@ index 66c6b7111a3a..74040db959d8 100644
        {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */
        {QMI_QUIRK_SET_DTR(0x1bc7, 0x1050, 2)}, /* Telit FN980 */
        {QMI_QUIRK_SET_DTR(0x1bc7, 0x1060, 2)}, /* Telit LN920 */
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index e7d19ce26a9bbd8cc5d25bc11f248afbf313aa4c..38007a27adbb4838b2542cd56a3fe36b82781574 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -36,3 +36,4 @@ platform-x86-acer-wmi-enable-sw_tablet_mode-on-switc.patch
 platform-x86-hp-wmi-ignore-smart-experience-app-even.patch
 tcp-configurable-source-port-perturb-table-size.patch
 net-usb-qmi_wwan-add-telit-0x103a-composition.patch
+drm-amdgpu-always-register-an-mmu-notifier-for-userptr.patch