Message ID | 1398207345-1865-4-git-send-email-przanoni@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Apr 22, 2014 at 07:55:45PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > We already call intel_dp_power_get, which will get a power domain, and > every power domain should get a runtime PM reference, which will wake > up the machine. intel_crt_detect() could use the same treatment > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index a25f708..a0b1cda 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -3171,11 +3171,9 @@ intel_dp_detect(struct drm_connector *connector, bool force) > struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); > struct intel_encoder *intel_encoder = &intel_dig_port->base; > struct drm_device *dev = connector->dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > enum drm_connector_status status; > struct edid *edid = NULL; > > - intel_runtime_pm_get(dev_priv); > intel_dp_power_get(intel_encoder); > > DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", > @@ -3209,7 +3207,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) > > out: > intel_dp_power_put(intel_encoder); > - intel_runtime_pm_put(dev_priv); > > return status; > } > -- > 1.9.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index a25f708..a0b1cda 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3171,11 +3171,9 @@ intel_dp_detect(struct drm_connector *connector, bool force) struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_encoder *intel_encoder = &intel_dig_port->base; struct drm_device *dev = connector->dev; - struct drm_i915_private *dev_priv = dev->dev_private; enum drm_connector_status status; struct edid *edid = NULL; - intel_runtime_pm_get(dev_priv); intel_dp_power_get(intel_encoder); DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", @@ -3209,7 +3207,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) out: intel_dp_power_put(intel_encoder); - intel_runtime_pm_put(dev_priv); return status; }