From: Greg Kroah-Hartman Date: Mon, 10 Jun 2019 14:41:55 +0000 (+0200) Subject: drop queue-4.19/drm-amdgpu-soc15-skip-reset-on-init.patch X-Git-Tag: v5.1.9~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75cc969a4d2daf47ed474739231e5182385adbc0;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/drm-amdgpu-soc15-skip-reset-on-init.patch --- diff --git a/queue-4.19/drm-amdgpu-soc15-skip-reset-on-init.patch b/queue-4.19/drm-amdgpu-soc15-skip-reset-on-init.patch deleted file mode 100644 index 855f81e74a6..00000000000 --- a/queue-4.19/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 -@@ -495,6 +495,11 @@ int soc15_set_ip_blocks(struct amdgpu_de - return -EINVAL; - } - -+ /* Just return false for soc15 GPUs. Reset does not seem to -+ * be necessary. -+ */ -+ return false; -+ - if (adev->flags & AMD_IS_APU) - adev->nbio_funcs = &nbio_v7_0_funcs; - else if (adev->asic_type == CHIP_VEGA20) diff --git a/queue-4.19/series b/queue-4.19/series index 280e5c415a2..41d87b32c23 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -43,7 +43,6 @@ drm-amdgpu-psp-move-psp-version-specific-function-pointers-to-early_init.patch drm-radeon-prefer-lower-reference-dividers.patch drm-amdgpu-remove-atpx_dgpu_req_power_for_displays-check-when-hotplug-in.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 drm-i915-maintain-consistent-documentation-subsection-ordering.patch drm-don-t-block-fb-changes-for-async-plane-updates.patch