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>

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 4b085611a28166b20ca4715b2bb92fe26460989c..133573c0adf82a39d663a2668f1449fae22b7f2b 100644 (file)
--- 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)
        struct intel_load_detect_pipe tmp;
        struct drm_modeset_acquire_ctx ctx;
 
-       intel_runtime_pm_get(dev_priv);
-
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
                      connector->base.id, connector->name,
                      force);
@@ -713,8 +711,6 @@ intel_crt_detect(struct drm_connector *connector, bool force)
 
 out:
        intel_display_power_put(dev_priv, power_domain);
-       intel_runtime_pm_put(dev_priv);
-
        return status;
 }
 

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 86b5e979e616b6df52a49231bb1d1cad7306d861..9274ddfd78c72fd2e2e0af16e9acb0985dbe911e 100644 (file)
--- 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)
        enum intel_display_power_domain power_domain;
        struct edid *edid = NULL;
 
-       intel_runtime_pm_get(dev_priv);
-
        power_domain = intel_display_port_power_domain(intel_encoder);
        intel_display_power_get(dev_priv, power_domain);
 
@@ -3657,9 +3655,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)
 
 out:
        intel_display_power_put(dev_priv, power_domain);
-
-       intel_runtime_pm_put(dev_priv);
-
        return status;
 }