diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-04-24 09:50:56 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 01:05:23 -0400 |
commit | 4651fb23f6f1d86700b07a27ad7f137d28492342 (patch) | |
tree | 9005dc76a7becf4dd610ee2df9543354a02bc256 | |
parent | b47adc1792422f4caf6c1db0a2b235bfd4f02521 (diff) |
drm/i915: remove useless runtime PM get calls
We already call intel_display_power_get, which will get a power
domain, and every power domain should get a runtime PM reference,
which will wake up the machine.
v2: - Also touch intel_crt_detect() (Ville).
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: Fixup commit message as spotted by Ville.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 4b085611a281..133573c0adf8 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -660,8 +660,6 @@ intel_crt_detect(struct drm_connector *connector, bool force) | |||
660 | struct intel_load_detect_pipe tmp; | 660 | struct intel_load_detect_pipe tmp; |
661 | struct drm_modeset_acquire_ctx ctx; | 661 | struct drm_modeset_acquire_ctx ctx; |
662 | 662 | ||
663 | intel_runtime_pm_get(dev_priv); | ||
664 | |||
665 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n", | 663 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n", |
666 | connector->base.id, connector->name, | 664 | connector->base.id, connector->name, |
667 | force); | 665 | force); |
@@ -713,8 +711,6 @@ intel_crt_detect(struct drm_connector *connector, bool force) | |||
713 | 711 | ||
714 | out: | 712 | out: |
715 | intel_display_power_put(dev_priv, power_domain); | 713 | intel_display_power_put(dev_priv, power_domain); |
716 | intel_runtime_pm_put(dev_priv); | ||
717 | |||
718 | return status; | 714 | return status; |
719 | } | 715 | } |
720 | 716 | ||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 86b5e979e616..9274ddfd78c7 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -3621,8 +3621,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) | |||
3621 | enum intel_display_power_domain power_domain; | 3621 | enum intel_display_power_domain power_domain; |
3622 | struct edid *edid = NULL; | 3622 | struct edid *edid = NULL; |
3623 | 3623 | ||
3624 | intel_runtime_pm_get(dev_priv); | ||
3625 | |||
3626 | power_domain = intel_display_port_power_domain(intel_encoder); | 3624 | power_domain = intel_display_port_power_domain(intel_encoder); |
3627 | intel_display_power_get(dev_priv, power_domain); | 3625 | intel_display_power_get(dev_priv, power_domain); |
3628 | 3626 | ||
@@ -3657,9 +3655,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) | |||
3657 | 3655 | ||
3658 | out: | 3656 | out: |
3659 | intel_display_power_put(dev_priv, power_domain); | 3657 | intel_display_power_put(dev_priv, power_domain); |
3660 | |||
3661 | intel_runtime_pm_put(dev_priv); | ||
3662 | |||
3663 | return status; | 3658 | return status; |
3664 | } | 3659 | } |
3665 | 3660 | ||