From 58e62bd82bb639a268906e60dba049310d1d4467 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 9 Jun 2019 16:51:57 +0200 Subject: [PATCH] drop 4.14 patch --- .../drm-amdgpu-soc15-skip-reset-on-init.patch | 34 ------------------- queue-4.14/series | 1 - 2 files changed, 35 deletions(-) delete mode 100644 queue-4.14/drm-amdgpu-soc15-skip-reset-on-init.patch diff --git a/queue-4.14/drm-amdgpu-soc15-skip-reset-on-init.patch b/queue-4.14/drm-amdgpu-soc15-skip-reset-on-init.patch deleted file mode 100644 index cc0c70efe0b..00000000000 --- a/queue-4.14/drm-amdgpu-soc15-skip-reset-on-init.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5887a59961e2295c5b02f39dbc0ecf9212709b7b Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Fri, 17 May 2019 09:21:13 -0500 -Subject: drm/amdgpu/soc15: skip reset on init - -From: Alex Deucher - -commit 5887a59961e2295c5b02f39dbc0ecf9212709b7b upstream. - -Not necessary on soc15 and breaks driver reload on server cards. - -Acked-by: Amber Lin -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/gpu/drm/amd/amdgpu/soc15.c -+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c -@@ -474,6 +474,11 @@ static void soc15_pcie_gen3_enable(struc - if (amdgpu_pcie_gen2 == 0) - return; - -+ /* Just return false for soc15 GPUs. Reset does not seem to -+ * be necessary. -+ */ -+ return false; -+ - if (adev->flags & AMD_IS_APU) - return; - diff --git a/queue-4.14/series b/queue-4.14/series index f62ecb6f28c..775a1e4b9a7 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -28,6 +28,5 @@ drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch drm-amdgpu-psp-move-psp-version-specific-function-pointers-to-early_init.patch drm-radeon-prefer-lower-reference-dividers.patch drm-i915-fix-i915_exec_ring_mask.patch -drm-amdgpu-soc15-skip-reset-on-init.patch drm-i915-fbc-disable-framebuffer-compression-on-geminilake.patch tty-serial_core-add-install.patch -- 2.47.2