|
@@ -1846,21 +1846,6 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static void intel_runtime_pm_disable(struct drm_i915_private *dev_priv)
|
|
|
|
-{
|
|
|
|
- struct drm_device *dev = dev_priv->dev;
|
|
|
|
- struct device *device = &dev->pdev->dev;
|
|
|
|
-
|
|
|
|
- if (!HAS_RUNTIME_PM(dev))
|
|
|
|
- return;
|
|
|
|
-
|
|
|
|
- if (!intel_enable_rc6(dev))
|
|
|
|
- return;
|
|
|
|
-
|
|
|
|
- /* Make sure we're not suspended first. */
|
|
|
|
- pm_runtime_get_sync(device);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* intel_power_domains_fini - finalizes the power domain structures
|
|
* intel_power_domains_fini - finalizes the power domain structures
|
|
* @dev_priv: i915 device instance
|
|
* @dev_priv: i915 device instance
|
|
@@ -1871,8 +1856,6 @@ static void intel_runtime_pm_disable(struct drm_i915_private *dev_priv)
|
|
*/
|
|
*/
|
|
void intel_power_domains_fini(struct drm_i915_private *dev_priv)
|
|
void intel_power_domains_fini(struct drm_i915_private *dev_priv)
|
|
{
|
|
{
|
|
- intel_runtime_pm_disable(dev_priv);
|
|
|
|
-
|
|
|
|
/* The i915.ko module is still not prepared to be loaded when
|
|
/* The i915.ko module is still not prepared to be loaded when
|
|
* the power well is not enabled, so just enable it in case
|
|
* the power well is not enabled, so just enable it in case
|
|
* we're going to unload/reload. */
|
|
* we're going to unload/reload. */
|