From d2894c9e58bcc8c7e41dd511cb7f7f96262bf662 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 7 Mar 2016 07:58:04 +0000
Subject: [PATCH] Revert "drm/radeon: call hpd_irq_event on resume"

It is reported to cause regressions (crash/hang) on some systems.
---
 debian/changelog                              |  3 ++-
 ...-radeon-call-hpd_irq_event-on-resume.patch | 22 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch

diff --git a/debian/changelog b/debian/changelog
index 5af982db8..31250bce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -303,7 +303,6 @@ linux (4.4.4-1) UNRELEASED; urgency=medium
       link training
     - drm/nouveau: platform: Fix deferred probe
     - drm/radeon: Fix off-by-one errors in radeon_vm_bo_set_addr
-    - drm/radeon: call hpd_irq_event on resume
     - drm/radeon: Fix "slow" audio over DP on DCE8+
     - drm/radeon: clean up fujitsu quirks
     - drm/radeon: properly byte swap vce firmware setup
@@ -453,6 +452,8 @@ linux (4.4.4-1) UNRELEASED; urgency=medium
     - usb-modules: Include USB PHY drivers by default
   * uas: Fix high-order alloc
   * Fix/ignore module ABI changes in 4.4.4 as appropriate
+  * Revert "drm/radeon: call hpd_irq_event on resume", reported to cause
+    regressions (crash/hang) on some systems
 
   [ Ian Campbell ]
   * [armhf] dts: Add DTB for Novena, patches from Vagrant Cascadian
diff --git a/debian/patches/bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch b/debian/patches/bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch
new file mode 100644
index 000000000..8ad228d9f
--- /dev/null
+++ b/debian/patches/bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 7 Mar 2016 07:55:44 +0000
+Subject: Revert "drm/radeon: call hpd_irq_event on resume"
+
+This reverts commit dbb17a21c131eca94eb31136eee9a7fe5aff00d9,
+reported to cause regressions (crash/hang) on some systems.
+---
+ drivers/gpu/drm/radeon/radeon_device.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
+index 902b59cebac5..4197ca1bb1e4 100644
+--- a/drivers/gpu/drm/radeon/radeon_device.c
++++ b/drivers/gpu/drm/radeon/radeon_device.c
+@@ -1744,7 +1744,6 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
+ 	}
+ 
+ 	drm_kms_helper_poll_enable(dev);
+-	drm_helper_hpd_irq_event(dev);
+ 
+ 	/* set the power state here in case we are a PX system or headless */
+ 	if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
diff --git a/debian/patches/series b/debian/patches/series
index 1ee0445c8..9ec006a5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -132,3 +132,4 @@ debian/revert-cgroup-make-sure-a-parent-css-isn-t-offlined.patch
 debian/thermal-fix-abi-change-in-4.4.4.patch
 debian/ipv4-fix-abi-change-in-4.4.4.patch
 debian/ipv6-fix-abi-change-in-4.4.4.patch
+bugfix/all/revert-drm-radeon-call-hpd_irq_event-on-resume.patch