diff options
| author |   jsg <jsg@openbsd.org> | 2020-05-11 05:11:23 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-05-11 05:11:23 +0000 |
| commit | 5a294ea0b1a7d4e97fc46a0f8cdd3a952bc6a6f5 (patch) | |
| tree | 536399ad65b4330b39652eefbf13d8de7d0f4bc1 | |
| parent | drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii) (diff) | |
| download | wireguard-openbsd-5a294ea0b1a7d4e97fc46a0f8cdd3a952bc6a6f5.tar.xz wireguard-openbsd-5a294ea0b1a7d4e97fc46a0f8cdd3a952bc6a6f5.zip | |
drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event
From Aaron Ma
74edc32fda52b684a9af99dd65aa7745a170a18d in linux 4.19.y/4.19.122
5932d260a8d85a103bd6c504fbb85ff58b156bf9 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_pm.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_pm.c index b811ba056b0..53c1e1b0de2 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_pm.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_pm.c @@ -71,7 +71,8 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev) 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); } |