]>
Commit | Line | Data |
---|---|---|
29167bff GKH |
1 | From bdb1ccb080dafc1b4224873a5b759ff85a7d1c10 Mon Sep 17 00:00:00 2001 |
2 | From: Aaron Liu <aaron.liu@amd.com> | |
3 | Date: Tue, 30 Apr 2019 09:47:25 +0800 | |
4 | Subject: drm/amdgpu: remove ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check when hotplug-in | |
5 | ||
6 | From: Aaron Liu <aaron.liu@amd.com> | |
7 | ||
8 | commit bdb1ccb080dafc1b4224873a5b759ff85a7d1c10 upstream. | |
9 | ||
10 | In amdgpu_atif_handler, when hotplug event received, remove | |
11 | ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check. This bit's check will cause missing | |
12 | system resume. | |
13 | ||
14 | Signed-off-by: Aaron Liu <aaron.liu@amd.com> | |
15 | Reviewed-by: Alex Deucher <alexander.deucher@amd.com> | |
16 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
17 | Cc: stable@vger.kernel.org | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | ||
20 | --- | |
21 | drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +-- | |
22 | 1 file changed, 1 insertion(+), 2 deletions(-) | |
23 | ||
24 | --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | |
25 | +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | |
26 | @@ -464,8 +464,7 @@ static int amdgpu_atif_handler(struct am | |
27 | } | |
28 | } | |
29 | if (req.pending & ATIF_DGPU_DISPLAY_EVENT) { | |
30 | - if ((adev->flags & AMD_IS_PX) && | |
31 | - amdgpu_atpx_dgpu_req_power_for_displays()) { | |
32 | + if (adev->flags & AMD_IS_PX) { | |
33 | pm_runtime_get_sync(adev->ddev->dev); | |
34 | /* Just fire off a uevent and let userspace tell us what to do */ | |
35 | drm_helper_hpd_irq_event(adev->ddev); |