]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/amdgpu: remove ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check when hotplug-in
authorAaron Liu <aaron.liu@amd.com>
Tue, 30 Apr 2019 01:47:25 +0000 (09:47 +0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1838700
commit bdb1ccb080dafc1b4224873a5b759ff85a7d1c10 upstream.

In amdgpu_atif_handler, when hotplug event received, remove
ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check. This bit's check will cause missing
system resume.

Signed-off-by: Aaron Liu <aaron.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

index 0d8c3fc6eacefcfd71788e4442cc541a031a5416..8e78dd961deaf3a2b98f66b7a43fd1f71c67e20b 100644 (file)
@@ -405,8 +405,7 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev,
                }
        }
        if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {
-               if ((adev->flags & AMD_IS_PX) &&
-                   amdgpu_atpx_dgpu_req_power_for_displays()) {
+               if (adev->flags & AMD_IS_PX) {
                        pm_runtime_get_sync(adev->ddev->dev);
                        /* Just fire off a uevent and let userspace tell us what to do */
                        drm_helper_hpd_irq_event(adev->ddev);