]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some 5.4 and 4.19 drm patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jul 2023 12:03:35 +0000 (14:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jul 2023 12:03:35 +0000 (14:03 +0200)
queue-4.19/drm-amd-display-add-monitor-specific-edid-quirk.patch [deleted file]
queue-4.19/series
queue-5.4/drm-amd-display-add-monitor-specific-edid-quirk.patch [deleted file]
queue-5.4/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch [deleted file]
queue-5.4/drm-ttm-never-consider-pinned-bos-for-eviction-swap.patch [deleted file]
queue-5.4/series

diff --git a/queue-4.19/drm-amd-display-add-monitor-specific-edid-quirk.patch b/queue-4.19/drm-amd-display-add-monitor-specific-edid-quirk.patch
deleted file mode 100644 (file)
index 6e28de4..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 613a7956deb3b1ffa2810c6d4c90ee9c3d743dbb Mon Sep 17 00:00:00 2001
-From: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Date: Mon, 12 Jun 2023 12:44:00 -0400
-Subject: drm/amd/display: Add monitor specific edid quirk
-
-From: Aurabindo Pillai <aurabindo.pillai@amd.com>
-
-commit 613a7956deb3b1ffa2810c6d4c90ee9c3d743dbb upstream.
-
-Disable FAMS on a Samsung Odyssey G9 monitor. Experiments show that this
-monitor does not work well under some use cases, and is likely
-implementation specific bug on the monitor's firmware.
-
-Cc: stable@vger.kernel.org
-Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
-Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c |   26 ++++++++++++++
- 1 file changed, 26 insertions(+)
-
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-@@ -41,6 +41,30 @@
- #include "dm_helpers.h"
-+static u32 edid_extract_panel_id(struct edid *edid)
-+{
-+      return (u32)edid->mfg_id[0] << 24   |
-+             (u32)edid->mfg_id[1] << 16   |
-+             (u32)EDID_PRODUCT_ID(edid);
-+}
-+
-+static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps)
-+{
-+      uint32_t panel_id = edid_extract_panel_id(edid);
-+
-+      switch (panel_id) {
-+      /* Workaround for some monitors which does not work well with FAMS */
-+      case drm_edid_encode_panel_id('S', 'A', 'M', 0x0E5E):
-+      case drm_edid_encode_panel_id('S', 'A', 'M', 0x7053):
-+      case drm_edid_encode_panel_id('S', 'A', 'M', 0x71AC):
-+              DRM_DEBUG_DRIVER("Disabling FAMS on monitor with panel id %X\n", panel_id);
-+              edid_caps->panel_patch.disable_fams = true;
-+              break;
-+      default:
-+              return;
-+      }
-+}
-+
- /* dm_helpers_parse_edid_caps
-  *
-  * Parse edid caps
-@@ -126,6 +150,8 @@ enum dc_edid_status dm_helpers_parse_edi
-       else
-               edid_caps->speaker_flags = DEFAULT_SPEAKER_LOCATION;
-+      apply_edid_quirks(edid_buf, edid_caps);
-+
-       kfree(sads);
-       kfree(sadb);
index 77e05e2b8298ecb9de9e9c50982450e420a8a6fc..2bb2073105f3ed72dd48af96b187d1cfeddfc43b 100644 (file)
@@ -172,5 +172,4 @@ misc-pci_endpoint_test-free-irqs-before-removing-the-device.patch
 misc-pci_endpoint_test-re-init-completion-for-every-test.patch
 md-raid0-add-discard-support-for-the-original-layout.patch
 fs-dlm-return-positive-pid-value-for-f_getlk.patch
-drm-amd-display-add-monitor-specific-edid-quirk.patch
 serial-atmel-don-t-enable-irqs-prematurely.patch
diff --git a/queue-5.4/drm-amd-display-add-monitor-specific-edid-quirk.patch b/queue-5.4/drm-amd-display-add-monitor-specific-edid-quirk.patch
deleted file mode 100644 (file)
index b86230b..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 613a7956deb3b1ffa2810c6d4c90ee9c3d743dbb Mon Sep 17 00:00:00 2001
-From: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Date: Mon, 12 Jun 2023 12:44:00 -0400
-Subject: drm/amd/display: Add monitor specific edid quirk
-
-From: Aurabindo Pillai <aurabindo.pillai@amd.com>
-
-commit 613a7956deb3b1ffa2810c6d4c90ee9c3d743dbb upstream.
-
-Disable FAMS on a Samsung Odyssey G9 monitor. Experiments show that this
-monitor does not work well under some use cases, and is likely
-implementation specific bug on the monitor's firmware.
-
-Cc: stable@vger.kernel.org
-Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
-Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c |   26 ++++++++++++++
- 1 file changed, 26 insertions(+)
-
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-@@ -40,6 +40,30 @@
- #include "dm_helpers.h"
-+static u32 edid_extract_panel_id(struct edid *edid)
-+{
-+      return (u32)edid->mfg_id[0] << 24   |
-+             (u32)edid->mfg_id[1] << 16   |
-+             (u32)EDID_PRODUCT_ID(edid);
-+}
-+
-+static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps)
-+{
-+      uint32_t panel_id = edid_extract_panel_id(edid);
-+
-+      switch (panel_id) {
-+      /* Workaround for some monitors which does not work well with FAMS */
-+      case drm_edid_encode_panel_id('S', 'A', 'M', 0x0E5E):
-+      case drm_edid_encode_panel_id('S', 'A', 'M', 0x7053):
-+      case drm_edid_encode_panel_id('S', 'A', 'M', 0x71AC):
-+              DRM_DEBUG_DRIVER("Disabling FAMS on monitor with panel id %X\n", panel_id);
-+              edid_caps->panel_patch.disable_fams = true;
-+              break;
-+      default:
-+              return;
-+      }
-+}
-+
- /* dm_helpers_parse_edid_caps
-  *
-  * Parse edid caps
-@@ -125,6 +149,8 @@ enum dc_edid_status dm_helpers_parse_edi
-       else
-               edid_caps->speaker_flags = DEFAULT_SPEAKER_LOCATION;
-+      apply_edid_quirks(edid_buf, edid_caps);
-+
-       kfree(sads);
-       kfree(sadb);
diff --git a/queue-5.4/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch b/queue-5.4/drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
deleted file mode 100644 (file)
index a86f285..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From ea2c3c08554601b051d91403a241266e1cf490a5 Mon Sep 17 00:00:00 2001
-From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-Date: Fri, 16 Jun 2023 15:14:07 +0200
-Subject: drm/amdgpu: fix clearing mappings for BOs that are always valid in VM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-
-commit ea2c3c08554601b051d91403a241266e1cf490a5 upstream.
-
-Per VM BOs must be marked as moved or otherwise their ranges are not
-updated on use which might be necessary when the replace operation
-splits mappings.
-
-This fixes random GPU hangs when replacing sparse mappings from the
-userspace, while OP_MAP/OP_UNMAP works fine because always valid BOs
-are correctly handled there.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -2362,18 +2362,30 @@ int amdgpu_vm_bo_clear_mappings(struct a
-       /* Insert partial mapping before the range */
-       if (!list_empty(&before->list)) {
-+              struct amdgpu_bo *bo = before->bo_va->base.bo;
-+
-               amdgpu_vm_it_insert(before, &vm->va);
-               if (before->flags & AMDGPU_PTE_PRT)
-                       amdgpu_vm_prt_get(adev);
-+
-+              if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv &&
-+                  !before->bo_va->base.moved)
-+                      amdgpu_vm_bo_moved(&before->bo_va->base);
-       } else {
-               kfree(before);
-       }
-       /* Insert partial mapping after the range */
-       if (!list_empty(&after->list)) {
-+              struct amdgpu_bo *bo = after->bo_va->base.bo;
-+
-               amdgpu_vm_it_insert(after, &vm->va);
-               if (after->flags & AMDGPU_PTE_PRT)
-                       amdgpu_vm_prt_get(adev);
-+
-+              if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv &&
-+                  !after->bo_va->base.moved)
-+                      amdgpu_vm_bo_moved(&after->bo_va->base);
-       } else {
-               kfree(after);
-       }
diff --git a/queue-5.4/drm-ttm-never-consider-pinned-bos-for-eviction-swap.patch b/queue-5.4/drm-ttm-never-consider-pinned-bos-for-eviction-swap.patch
deleted file mode 100644 (file)
index bda0d8e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From a2848d08742c8e8494675892c02c0d22acbe3cf8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Fri, 7 Jul 2023 11:25:00 +0200
-Subject: drm/ttm: never consider pinned BOs for eviction&swap
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Christian König <christian.koenig@amd.com>
-
-commit a2848d08742c8e8494675892c02c0d22acbe3cf8 upstream.
-
-There is a small window where we have already incremented the pin count
-but not yet moved the bo from the lru to the pinned list.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reported-by: Pelloux-Prayer, Pierre-Eric <Pierre-eric.Pelloux-prayer@amd.com>
-Tested-by: Pelloux-Prayer, Pierre-Eric <Pierre-eric.Pelloux-prayer@amd.com>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Link: https://patchwork.freedesktop.org/patch/msgid/20230707120826.3701-1-christian.koenig@amd.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/ttm/ttm_bo.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpu/drm/ttm/ttm_bo.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo.c
-@@ -784,6 +784,12 @@ static bool ttm_bo_evict_swapout_allowab
- {
-       bool ret = false;
-+      if (bo->pin_count) {
-+              *locked = false;
-+              *busy = false;
-+              return false;
-+      }
-+
-       if (bo->base.resv == ctx->resv) {
-               dma_resv_assert_held(bo->base.resv);
-               if (ctx->flags & TTM_OPT_FLAG_ALLOW_RES_EVICT
index 8fad3716886b591bc65bf0eba5d3e75bd11d20a8..4cbc49e5edb31b980ab92f879d68f6ae9e9460a2 100644 (file)
@@ -256,8 +256,5 @@ md-raid0-add-discard-support-for-the-original-layout.patch
 fs-dlm-return-positive-pid-value-for-f_getlk.patch
 drm-atomic-allow-vblank-enabled-self-refresh-disable.patch
 drm-rockchip-vop-leave-vblank-enabled-in-self-refresh.patch
-drm-amdgpu-fix-clearing-mappings-for-bos-that-are-always-valid-in-vm.patch
-drm-amd-display-add-monitor-specific-edid-quirk.patch
-drm-ttm-never-consider-pinned-bos-for-eviction-swap.patch
 serial-atmel-don-t-enable-irqs-prematurely.patch
 firmware-stratix10-svc-fix-a-potential-resource-leak-in-svc_create_memory_pool.patch