drop queue-5.6/drm-amdgpu-bump-version-for-invalidate-l2-before-sdm.patch

diff --git a/queue-5.6/drm-amdgpu-bump-version-for-invalidate-l2-before-sdm.patch b/queue-5.6/drm-amdgpu-bump-version-for-invalidate-l2-before-sdm.patch
deleted file mode 100644 (file)
index 2990489..0000000
--- a/queue-5.6/drm-amdgpu-bump-version-for-invalidate-l2-before-sdm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eb1227b6f438ccaa61a7bac2fbd5f33483d31f5b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Apr 2020 16:25:39 -0400
-Subject: drm/amdgpu: bump version for invalidate L2 before SDMA IBs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Marek Olšák <marek.olsak@amd.com>
-
-[ Upstream commit 9017a4897a20658f010bebea825262963c10afa6 ]
-
-This fixes GPU hangs due to cache coherency issues.
-Bump the driver version. Split out from the original patch.
-
-Signed-off-by: Marek Olšák <marek.olsak@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-index 42f4febe24c6d..8d45a2b662aeb 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-@@ -85,9 +85,10 @@
-  * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches
-  * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask
-  * - 3.36.0 - Allow reading more status registers on si/cik
-+ * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness
-  */
- #define KMS_DRIVER_MAJOR      3
--#define KMS_DRIVER_MINOR      36
-+#define KMS_DRIVER_MINOR      37
- #define KMS_DRIVER_PATCHLEVEL 0
- 
- int amdgpu_vram_limit = 0;
--- 
-2.20.1
-

diff --git a/queue-5.6/series b/queue-5.6/series
index b2689c977b7ec9a40dd65870705fef51d456a052..2ae456bb929d5cdbf0c9727bcf0db31654e7e6b4 100644 (file)
--- a/queue-5.6/series
+++ b/queue-5.6/series
@@ -57,7 +57,6 @@ selftests-ftrace-check-the-first-record-for-kprobe_a.patch
 cpufreq-intel_pstate-only-mention-the-bios-disabling.patch
 alsa-hda-hdmi-fix-race-in-monitor-detection-during-p.patch
 drm-amd-powerplay-avoid-using-pm_en-before-it-is-ini.patch
-drm-amdgpu-bump-version-for-invalidate-l2-before-sdm.patch
 drm-amd-display-check-if-refclk_cntl-register-is-pre.patch
 drm-amd-display-defer-cursor-update-around-vupdate-f.patch
 drm-amd-display-update-downspread-percent-to-match-s.patch