From: Greg Kroah-Hartman Date: Sun, 4 Oct 2020 10:58:31 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.19.150~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9f17e7de8a12a6375d205a750de3324c0d9421f;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch --- diff --git a/queue-4.9/drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch b/queue-4.9/drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch new file mode 100644 index 00000000000..973cc17fe7b --- /dev/null +++ b/queue-4.9/drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch @@ -0,0 +1,43 @@ +From a39d0d7bdf8c21ac7645c02e9676b5cb2b804c31 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Mon, 28 Sep 2020 11:10:37 +0200 +Subject: drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config + +From: Jean Delvare + +commit a39d0d7bdf8c21ac7645c02e9676b5cb2b804c31 upstream. + +A recent attempt to fix a ref count leak in +amdgpu_display_crtc_set_config() turned out to be doing too much and +"fixed" an intended decrease as if it were a leak. Undo that part to +restore the proper balance. This is the very nature of this function +to increase or decrease the power reference count depending on the +situation. + +Consequences of this bug is that the power reference would +eventually get down to 0 while the display was still in use, +resulting in that display switching off unexpectedly. + +Signed-off-by: Jean Delvare +Fixes: e008fa6fb415 ("drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config") +Cc: stable@vger.kernel.org +Cc: Navid Emamdoost +Cc: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +@@ -283,7 +283,7 @@ int amdgpu_crtc_set_config(struct drm_mo + take the current one */ + if (active && !adev->have_disp_power_ref) { + adev->have_disp_power_ref = true; +- goto out; ++ return ret; + } + /* if we have no active crtcs, then drop the power ref + we got before */ diff --git a/queue-4.9/input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch b/queue-4.9/input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch new file mode 100644 index 00000000000..2d7fc55bb94 --- /dev/null +++ b/queue-4.9/input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch @@ -0,0 +1,45 @@ +From 5fc27b098dafb8e30794a9db0705074c7d766179 Mon Sep 17 00:00:00 2001 +From: Jiri Kosina +Date: Mon, 28 Sep 2020 16:21:17 -0700 +Subject: Input: i8042 - add nopnp quirk for Acer Aspire 5 A515 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jiri Kosina + +commit 5fc27b098dafb8e30794a9db0705074c7d766179 upstream. + +Touchpad on this laptop is not detected properly during boot, as PNP +enumerates (wrongly) AUX port as disabled on this machine. + +Fix that by adding this board (with admittedly quite funny DMI +identifiers) to nopnp quirk list. + +Reported-by: Andrés Barrantes Silman +Signed-off-by: Jiri Kosina +Link: https://lore.kernel.org/r/nycvar.YFH.7.76.2009252337340.3336@cbobk.fhfr.pm +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -797,6 +797,13 @@ static const struct dmi_system_id __init + DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), + }, + }, ++ { ++ /* Acer Aspire 5 A515 */ ++ .matches = { ++ DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"), ++ DMI_MATCH(DMI_BOARD_VENDOR, "PK"), ++ }, ++ }, + { } + }; + diff --git a/queue-4.9/series b/queue-4.9/series index be5dc495ae2..f24ab3a9a41 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -2,3 +2,5 @@ vsock-virtio-use-rcu-to-avoid-use-after-free-on-the_.patch vsock-virtio-stop-workers-during-the-.remove.patch usb-gadget-f_ncm-fix-ndp16-datagram-validation.patch gpio-tc35894-fix-up-tc35894-interrupt-configuration.patch +input-i8042-add-nopnp-quirk-for-acer-aspire-5-a515.patch +drm-amdgpu-restore-proper-ref-count-in-amdgpu_display_crtc_set_config.patch