|
@@ -11395,15 +11395,6 @@ void intel_modeset_init(struct drm_device *dev)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void
|
|
|
|
-intel_connector_break_all_links(struct intel_connector *connector)
|
|
|
|
-{
|
|
|
|
- connector->base.dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
- connector->base.encoder = NULL;
|
|
|
|
- connector->encoder->connectors_active = false;
|
|
|
|
- connector->encoder->base.crtc = NULL;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static void intel_enable_pipe_a(struct drm_device *dev)
|
|
static void intel_enable_pipe_a(struct drm_device *dev)
|
|
{
|
|
{
|
|
struct intel_connector *connector;
|
|
struct intel_connector *connector;
|
|
@@ -11485,8 +11476,17 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
|
|
if (connector->encoder->base.crtc != &crtc->base)
|
|
if (connector->encoder->base.crtc != &crtc->base)
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- intel_connector_break_all_links(connector);
|
|
|
|
|
|
+ connector->base.dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
+ connector->base.encoder = NULL;
|
|
}
|
|
}
|
|
|
|
+ /* multiple connectors may have the same encoder:
|
|
|
|
+ * handle them and break crtc link separately */
|
|
|
|
+ list_for_each_entry(connector, &dev->mode_config.connector_list,
|
|
|
|
+ base.head)
|
|
|
|
+ if (connector->encoder->base.crtc == &crtc->base) {
|
|
|
|
+ connector->encoder->base.crtc = NULL;
|
|
|
|
+ connector->encoder->connectors_active = false;
|
|
|
|
+ }
|
|
|
|
|
|
WARN_ON(crtc->active);
|
|
WARN_ON(crtc->active);
|
|
crtc->base.enabled = false;
|
|
crtc->base.enabled = false;
|
|
@@ -11568,6 +11568,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
|
|
drm_get_encoder_name(&encoder->base));
|
|
drm_get_encoder_name(&encoder->base));
|
|
encoder->disable(encoder);
|
|
encoder->disable(encoder);
|
|
}
|
|
}
|
|
|
|
+ encoder->base.crtc = NULL;
|
|
|
|
+ encoder->connectors_active = false;
|
|
|
|
|
|
/* Inconsistent output/port/pipe state happens presumably due to
|
|
/* Inconsistent output/port/pipe state happens presumably due to
|
|
* a bug in one of the get_hw_state functions. Or someplace else
|
|
* a bug in one of the get_hw_state functions. Or someplace else
|
|
@@ -11578,8 +11580,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
|
|
base.head) {
|
|
base.head) {
|
|
if (connector->encoder != encoder)
|
|
if (connector->encoder != encoder)
|
|
continue;
|
|
continue;
|
|
-
|
|
|
|
- intel_connector_break_all_links(connector);
|
|
|
|
|
|
+ connector->base.dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
+ connector->base.encoder = NULL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/* Enabled encoders without active connectors will be fixed in
|
|
/* Enabled encoders without active connectors will be fixed in
|