drm/i915: Reinit polling before hpd when resuming

Now that we don't run the connector reprobing from i915_drm_resume(), we
need to make it so we don't have to wait for reprobing to finish so that
we actually speed things up. In order to do this, we need to make sure
that i915_drm_resume() doesn't get blocked by i915_hpd_poll_init_work()
while trying to acquire the mode_config lock that
drm_kms_helper_poll_enable() needs to acquire.

The easiest way to do this is to just enable polling before hpd. This
shouldn't break anything since at that point we have everything else we
need for polling enabled.

As well, this should result in a rather significant improvement in how
quickly we can resume the system.

Signed-off-by: Lyude <lyude@redhat.com>
Tested-by: David Weinehall <david.weinehall@linux.intel.com>
Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Testcase: analyze_suspend.py -config config/suspend-callgraph.cfg -filter i915

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0e45665efd7fa2fbd894a1e3ec45f94885ec62c3..b72c24ff39c34ce454b28dbabfc77dc90aa356ac 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1600,6 +1600,8 @@ static int i915_drm_resume(struct drm_device *dev)
 
        intel_display_resume(dev);
 
+       drm_kms_helper_poll_enable(dev);
+
        /*
         * ... but also need to make sure that hotplug processing
         * doesn't cause havoc. Like in the driver load code we don't
@@ -1619,7 +1621,6 @@ static int i915_drm_resume(struct drm_device *dev)
        intel_opregion_notify_adapter(dev_priv, PCI_D0);
 
        intel_autoenable_gt_powersave(dev_priv);
-       drm_kms_helper_poll_enable(dev);
 
        enable_rpm_wakeref_asserts(dev_priv);