Skip to content

Commit

Permalink
drm/i915: Reinit polling before hpd when resuming
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Lyude committed Nov 4, 2016
1 parent f97f193 commit e0b7006
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand Down

0 comments on commit e0b7006

Please sign in to comment.