From 13813b756c18f3a4e0d6c4fce46060c120ac5394 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 May 2020 22:26:03 +0200 Subject: [PATCH] 5.4-stable patches added patches: drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch --- ...when-pp_funcs-is-unset-in-acpi-event.patch | 35 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 queue-5.4/drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch diff --git a/queue-5.4/drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch b/queue-5.4/drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch new file mode 100644 index 00000000000..c0d2b7fcbff --- /dev/null +++ b/queue-5.4/drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch @@ -0,0 +1,35 @@ +From 5932d260a8d85a103bd6c504fbb85ff58b156bf9 Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Fri, 3 Apr 2020 22:34:19 +0800 +Subject: drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event + +From: Aaron Ma + +commit 5932d260a8d85a103bd6c504fbb85ff58b156bf9 upstream. + +On ARCTURUS and RENOIR, powerplay is not supported yet. +When plug in or unplug power jack, ACPI event will issue. +Then kernel NULL pointer BUG will be triggered. +Check for NULL pointers before calling. + +Signed-off-by: Aaron Ma +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -90,7 +90,8 @@ void amdgpu_pm_acpi_event_handler(struct + adev->pm.ac_power = true; + else + adev->pm.ac_power = false; +- if (adev->powerplay.pp_funcs->enable_bapm) ++ if (adev->powerplay.pp_funcs && ++ adev->powerplay.pp_funcs->enable_bapm) + amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power); + mutex_unlock(&adev->pm.mutex); + } diff --git a/queue-5.4/series b/queue-5.4/series index cbd0ea3103c..6b6f52299f5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -29,3 +29,4 @@ net-bcmgenet-suppress-warnings-on-failed-rx-skb-allo.patch net-systemport-suppress-warnings-on-failed-rx-skb-al.patch drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch +drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch -- 2.47.3