From: Greg Kroah-Hartman Date: Tue, 15 Nov 2016 19:24:37 +0000 (+0100) Subject: delete some 4.4 drm patches that broke the build. X-Git-Tag: v4.4.33~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a4faa05917f732e4a23628ef4d52de760749ada;p=thirdparty%2Fkernel%2Fstable-queue.git delete some 4.4 drm patches that broke the build. --- diff --git a/queue-4.4/drm-amdgpu-disable-runtime-pm-in-certain-cases.patch b/queue-4.4/drm-amdgpu-disable-runtime-pm-in-certain-cases.patch deleted file mode 100644 index 4d75f8b5b8f..00000000000 --- a/queue-4.4/drm-amdgpu-disable-runtime-pm-in-certain-cases.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 84b1528e8cef55274f0df20e93513b3060ce495a Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Mon, 31 Oct 2016 11:02:31 -0400 -Subject: drm/amdgpu: disable runtime pm in certain cases -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Alex Deucher - -commit 84b1528e8cef55274f0df20e93513b3060ce495a upstream. - -If the platform does not support hybrid graphics or ATPX dGPU -power control. - -Acked-by: Christian König -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -@@ -96,6 +96,8 @@ int amdgpu_driver_load_kms(struct drm_de - - if ((amdgpu_runtime_pm != 0) && - amdgpu_has_atpx() && -+ (amdgpu_is_atpx_hybrid() || -+ amdgpu_has_atpx_dgpu_power_cntl()) && - ((flags & AMD_IS_APU) == 0)) - flags |= AMD_IS_PX; - diff --git a/queue-4.4/drm-radeon-disable-runtime-pm-in-certain-cases.patch b/queue-4.4/drm-radeon-disable-runtime-pm-in-certain-cases.patch deleted file mode 100644 index 88b49bdbc45..00000000000 --- a/queue-4.4/drm-radeon-disable-runtime-pm-in-certain-cases.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 066f1f0b4719eb4573ef09bfc63c2bbb6f7676ca Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Mon, 31 Oct 2016 10:41:49 -0400 -Subject: drm/radeon: disable runtime pm in certain cases -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Alex Deucher - -commit 066f1f0b4719eb4573ef09bfc63c2bbb6f7676ca upstream. - -If the platform does not support hybrid graphics or ATPX dGPU -power control. - -bug: https://bugzilla.kernel.org/show_bug.cgi?id=51381 - -Acked-by: Christian König -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/radeon/radeon_device.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/drivers/gpu/drm/radeon/radeon_device.c -+++ b/drivers/gpu/drm/radeon/radeon_device.c -@@ -103,6 +103,14 @@ static const char radeon_family_name[][1 - "LAST", - }; - -+#if defined(CONFIG_VGA_SWITCHEROO) -+bool radeon_has_atpx_dgpu_power_cntl(void); -+bool radeon_is_atpx_hybrid(void); -+#else -+static inline bool radeon_has_atpx_dgpu_power_cntl(void) { return false; } -+static inline bool radeon_is_atpx_hybrid(void) { return false; } -+#endif -+ - #define RADEON_PX_QUIRK_DISABLE_PX (1 << 0) - #define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1) - -@@ -159,6 +167,11 @@ static void radeon_device_handle_px_quir - - if (rdev->px_quirk_flags & RADEON_PX_QUIRK_DISABLE_PX) - rdev->flags &= ~RADEON_IS_PX; -+ -+ /* disable PX is the system doesn't support dGPU power control or hybrid gfx */ -+ if (!radeon_is_atpx_hybrid() && -+ !radeon_has_atpx_dgpu_power_cntl()) -+ rdev->flags &= ~RADEON_IS_PX; - } - - /** diff --git a/queue-4.4/series b/queue-4.4/series index 0960646efec..e29583a32c1 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -22,6 +22,4 @@ iio-orientation-hid-sensor-rotation-add-pm-function-fix-non-working-driver.patch scsi-qla2xxx-fix-scsi-scan-hang-triggered-if-adapter-fails-during-init.patch scsi-mpt3sas-fix-for-block-device-of-raid-exists-even-after-deleting-raid-disk.patch kvm-mips-precalculate-mmio-load-resume-pc.patch -drm-radeon-disable-runtime-pm-in-certain-cases.patch drm-i915-respect-alternate_ddc_pin-for-all-ddi-ports.patch -drm-amdgpu-disable-runtime-pm-in-certain-cases.patch