|
@@ -3941,8 +3941,6 @@ static void intel_connector_check_state(struct intel_connector *connector)
|
|
|
* consider. */
|
|
|
void intel_connector_dpms(struct drm_connector *connector, int mode)
|
|
|
{
|
|
|
- struct intel_encoder *encoder = intel_attached_encoder(connector);
|
|
|
-
|
|
|
/* All the simple cases only support two dpms states. */
|
|
|
if (mode != DRM_MODE_DPMS_ON)
|
|
|
mode = DRM_MODE_DPMS_OFF;
|
|
@@ -3953,10 +3951,8 @@ void intel_connector_dpms(struct drm_connector *connector, int mode)
|
|
|
connector->dpms = mode;
|
|
|
|
|
|
/* Only need to change hw state when actually enabled */
|
|
|
- if (encoder->base.crtc)
|
|
|
- intel_encoder_dpms(encoder, mode);
|
|
|
- else
|
|
|
- WARN_ON(encoder->connectors_active != false);
|
|
|
+ if (connector->encoder)
|
|
|
+ intel_encoder_dpms(to_intel_encoder(connector->encoder), mode);
|
|
|
|
|
|
intel_modeset_check_state(connector->dev);
|
|
|
}
|