diff options
author | Lyude <lyude@redhat.com> | 2016-11-01 17:31:32 -0400 |
---|---|---|
committer | Lyude <lyude@redhat.com> | 2016-11-04 13:50:13 -0400 |
commit | f97f193613dc7b723fa1b7e187da0ba585a7f2de (patch) | |
tree | 17c7c67f6f9497925c404f96b18637f0d715c08b | |
parent | 9c7540241885838cfc7fa58c4a8bd75be0303ed1 (diff) |
drm/i915: Remove redundant reprobe in i915_drm_resume
Weine's investigation on benchmarking the suspend/resume process pointed
out a lot of the time in suspend/resume is being spent reprobing. While
the reprobing process is a lengthy one for good reason, we don't need to
hold up the entire suspend/resume process while we wait for it to
finish. Luckily as it turns out, we already trigger a full connector
reprobe in i915_hpd_poll_init_work(), so we can just ditch reprobing in
i915_drm_resume() entirely.
This won't lead to less time spent resuming just yet since now the
bottleneck will be waiting for the mode_config lock in
drm_kms_helper_poll_enable(), since that will be held as long as
i915_hpd_poll_init_work() is reprobing all of the connectors. But we'll
address that in the next patch.
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
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9e5a547a67ab..0e45665efd7f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -1607,8 +1607,6 @@ static int i915_drm_resume(struct drm_device *dev) | |||
1607 | * notifications. | 1607 | * notifications. |
1608 | * */ | 1608 | * */ |
1609 | intel_hpd_init(dev_priv); | 1609 | intel_hpd_init(dev_priv); |
1610 | /* Config may have changed between suspend and resume */ | ||
1611 | drm_helper_hpd_irq_event(dev); | ||
1612 | 1610 | ||
1613 | intel_opregion_register(dev_priv); | 1611 | intel_opregion_register(dev_priv); |
1614 | 1612 | ||