diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 18:14:23 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 18:14:23 -0400 |
| commit | 780735251af56b841b680a0861fb83c0f1a1890f (patch) | |
| tree | b3b19b5c4edfa37fd5787b6fec3d23dc2f05165d | |
| parent | fa955855c7519127ea43742d0b950521c29a3087 (diff) | |
| download | longterm-queue-4.18-780735251af56b841b680a0861fb83c0f1a1890f.tar.gz | |
drm: drop patch n/a for 4.18.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-amdgpu-remove-ATPX_DGPU_REQ_POWER_FOR_DISPLAYS-c.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/queue/drm-amdgpu-remove-ATPX_DGPU_REQ_POWER_FOR_DISPLAYS-c.patch b/queue/drm-amdgpu-remove-ATPX_DGPU_REQ_POWER_FOR_DISPLAYS-c.patch deleted file mode 100644 index 8f83e09..0000000 --- a/queue/drm-amdgpu-remove-ATPX_DGPU_REQ_POWER_FOR_DISPLAYS-c.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bdb1ccb080dafc1b4224873a5b759ff85a7d1c10 Mon Sep 17 00:00:00 2001 -From: Aaron Liu <aaron.liu@amd.com> -Date: Tue, 30 Apr 2019 09:47:25 +0800 -Subject: [PATCH] drm/amdgpu: remove ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check - when hotplug-in - -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 - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c -index 4376b17ca594..56f8ca2a3bb4 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c -@@ -464,8 +464,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); --- -2.9.5 - diff --git a/queue/series b/queue/series index 9e374cc..ff46d66 100644 --- a/queue/series +++ b/queue/series @@ -117,7 +117,6 @@ drm-nouveau-add-kconfig-option-to-turn-off-nouveau-l.patch drm-add-non-desktop-quirks-to-Sensics-and-OSVR-heads.patch drm-amdgpu-psp-move-psp-version-specific-function-po.patch drm-radeon-prefer-lower-reference-dividers.patch -drm-amdgpu-remove-ATPX_DGPU_REQ_POWER_FOR_DISPLAYS-c.patch drm-i915-Fix-I915_EXEC_RING_MASK.patch drm-i915-fbc-disable-framebuffer-compression-on-Gemi.patch drm-i915-fbc-disable-framebuffer-compression-on-Gemi.patch |