Instead of breaking all connections manually, kill them with
atomic modeset, if it happens. Now that the everything's atomic
some code becomes obsolete.
Forcing a atomic modeset with null mode and all connectors gone
updates the state too, in a cleaner way.
Because load detection is atomic too there can be no mismatch between
crtc->active and crtc->state->active
Changes since v1:
- Reword commit message.
- Set null mode and break all connectors when force disabling crtc.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/i915_debugfs.c | 8 +--
drivers/gpu/drm/i915/intel_display.c | 108 ++++++++++++++++-------------------
drivers/gpu/drm/i915/intel_drv.h | 2 +-
3 files changed, 53 insertions(+), 65 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 51fe0fbcd00c..db23916c1875 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3637,7 +3637,7 @@ static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev)
bool active = pipe_config->base.active;
if (active) {
- intel_crtc_control(&crtc->base, false);
+ intel_crtc_control(&crtc->base, false, false);
pipe_config = to_intel_crtc_state(crtc->base.state);
}
@@ -3647,7 +3647,7 @@ static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev)
POWER_DOMAIN_PIPE_PANEL_FITTER(PIPE_A));
if (active)
- intel_crtc_control(&crtc->base, true);
+ intel_crtc_control(&crtc->base, true, false);
}
drm_modeset_unlock_all(dev);
}
@@ -3671,7 +3671,7 @@ static void hsw_undo_trans_edp_pipe_A_crc_wa(struct drm_device *dev)
bool active = pipe_config->base.active;
if (active) {
- intel_crtc_control(&crtc->base, false);
+ intel_crtc_control(&crtc->base, false, false);
pipe_config = to_intel_crtc_state(crtc->base.state);
}
@@ -3681,7 +3681,7 @@ static void hsw_undo_trans_edp_pipe_A_crc_wa(struct drm_device *dev)
POWER_DOMAIN_PIPE_PANEL_FITTER(PIPE_A));
if (active)
- intel_crtc_control(&crtc->base, true);
+ intel_crtc_control(&crtc->base, true, false);
}
drm_modeset_unlock_all(dev);
}
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0f031658a297..1936a28a57c1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6192,7 +6192,7 @@ free:
}
/* Master function to enable/disable CRTC and corresponding power wells */
-int intel_crtc_control(struct drm_crtc *crtc, bool enable)
+int intel_crtc_control(struct drm_crtc *crtc, bool active, bool force)
{
struct drm_device *dev = crtc->dev;
struct drm_mode_config *config = &dev->mode_config;
@@ -6202,10 +6202,13 @@ int intel_crtc_control(struct drm_crtc *crtc, bool enable)
struct drm_atomic_state *state;
int ret;
- if (enable == intel_crtc->active)
+ if (WARN_ON(active && force))
+ return -EINVAL;
+
+ if (active == intel_crtc->active)
return 0;
- if (enable && !crtc->state->enable)
+ if (active && !crtc->state->enable)
return 0;
/* this function should be called with drm_modeset_lock_all for now */
@@ -6225,7 +6228,30 @@ int intel_crtc_control(struct drm_crtc *crtc, bool enable)
ret = PTR_ERR(pipe_config);
goto err;
}
- pipe_config->base.active = enable;
+ pipe_config->base.active = active;
+ if (force) {
+ struct drm_connector *connector;
+
+ ret = drm_atomic_set_mode_for_crtc(&pipe_config->base, NULL);
+ if (ret)
+ goto err;
+
+ list_for_each_entry(connector, &config->connector_list, head) {
+ struct drm_connector_state *conn_state;
+
+ if (connector->state->crtc != crtc)
+ continue;
+
+ conn_state = drm_atomic_get_connector_state(state, connector);
+ if (IS_ERR(conn_state)) {
+ ret = PTR_ERR(conn_state);
+ goto err;
+ }
+ ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
+ if (ret)
+ goto err;
+ }
+ }
ret = intel_set_mode(state);
if (!ret)
@@ -6249,7 +6275,7 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
for_each_encoder_on_crtc(dev, crtc, intel_encoder)
enable |= intel_encoder->connectors_active;
- intel_crtc_control(crtc, enable);
+ intel_crtc_control(crtc, enable, false);
}
void intel_encoder_destroy(struct drm_encoder *encoder)
@@ -14812,11 +14838,14 @@ intel_check_plane_mapping(struct intel_crtc *crtc)
return true;
}
-static void intel_sanitize_crtc(struct intel_crtc *crtc)
+static void intel_sanitize_crtc(struct intel_crtc *crtc,
+ struct intel_crtc_state *pipe_config)
{
struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_encoder *intel_encoder;
u32 reg;
+ bool enable;
/* Clear any frame start delays used for debugging left by the BIOS */
reg = PIPECONF(crtc->config->cpu_transcoder);
@@ -14833,7 +14862,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
* disable the crtc (and hence change the state) if it is wrong. Note
* that gen4+ has a fixed plane -> pipe mapping. */
if (INTEL_INFO(dev)->gen < 4 && !intel_check_plane_mapping(crtc)) {
- struct intel_connector *connector;
bool plane;
DRM_DEBUG_KMS("[CRTC:%d] wrong plane connection detected!\n",
@@ -14846,33 +14874,12 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
to_intel_plane_state(crtc->base.primary->state)->visible = true;
crtc->base.primary->crtc = &crtc->base;
crtc->plane = !plane;
- intel_crtc_control(&crtc->base, false);
+ intel_crtc_control(&crtc->base, false, true);
crtc->plane = plane;
-
- /* ... and break all links. */
- for_each_intel_connector(dev, connector) {
- if (connector->encoder->base.crtc != &crtc->base)
- continue;
-
- 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 */
- for_each_intel_connector(dev, connector)
- if (connector->encoder->base.crtc == &crtc->base) {
- connector->encoder->base.crtc = NULL;
- connector->encoder->connectors_active = false;
- }
-
- WARN_ON(crtc->active);
- crtc->base.state->enable = false;
- crtc->base.state->active = false;
- crtc->base.enabled = false;
}
if (dev_priv->quirks & QUIRK_PIPEA_FORCE &&
- crtc->pipe == PIPE_A && !crtc->active) {
+ crtc->pipe == PIPE_A && (!pipe_config || !pipe_config->base.active)) {
/* BIOS forgot to enable pipe A, this mostly happens after
* resume. Force-enable the pipe to fix this, the update_dpms
* call below we restore the pipe to the right state, but leave
@@ -14881,36 +14888,16 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
}
/* Adjust the state of the output pipe according to whether we
- * have active connectors/encoders. */
- intel_crtc_update_dpms(&crtc->base);
-
- if (crtc->active != crtc->base.state->active) {
- struct intel_encoder *encoder;
+ * have active connectors/encoders */
+ enable = false;
+ for_each_encoder_on_crtc(dev, &crtc->base, intel_encoder)
+ enable |= intel_encoder->connectors_active;
- /* This can happen either due to bugs in the get_hw_state
- * functions or because the pipe is force-enabled due to the
- * pipe A quirk. */
- DRM_DEBUG_KMS("[CRTC:%d] hw state adjusted, was %s, now %s\n",
- crtc->base.base.id,
- crtc->base.state->enable ? "enabled" : "disabled",
- crtc->active ? "enabled" : "disabled");
-
- crtc->base.state->enable = crtc->active;
- crtc->base.state->active = crtc->active;
- crtc->base.enabled = crtc->active;
-
- /* Because we only establish the connector -> encoder ->
- * crtc links if something is active, this means the
- * crtc is now deactivated. Break the links. connector
- * -> encoder links are only establish when things are
- * actually up, hence no need to break them. */
- WARN_ON(crtc->active);
-
- for_each_encoder_on_crtc(dev, &crtc->base, encoder) {
- WARN_ON(encoder->connectors_active);
- encoder->base.crtc = NULL;
- }
- }
+ /* only turn off separately if configuration's not restored,
+ * if it's restored it will change mode or turn off anyway.
+ */
+ if (!enable && crtc->base.state->active && !pipe_config)
+ intel_crtc_control(&crtc->base, false, true);
if (crtc->active || HAS_GMCH_DISPLAY(dev)) {
/*
@@ -15278,7 +15265,8 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
&crtc->state->adjusted_mode);
}
- intel_sanitize_crtc(intel_crtc);
+ intel_sanitize_crtc(intel_crtc, !force_restore ? NULL :
+ to_intel_crtc_state(crtc_state));
/*
* sanitize_crtc may have forced an update of crtc->state,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 807e001e4cee..ec721e31eae8 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -993,7 +993,7 @@ void intel_mark_busy(struct drm_device *dev);
void intel_mark_idle(struct drm_device *dev);
void intel_crtc_restore_mode(struct drm_crtc *crtc);
int intel_display_suspend(struct drm_device *dev);
-int intel_crtc_control(struct drm_crtc *crtc, bool enable);
+int intel_crtc_control(struct drm_crtc *crtc, bool active, bool force);
void intel_crtc_update_dpms(struct drm_crtc *crtc);
void intel_encoder_destroy(struct drm_encoder *encoder);
int intel_connector_init(struct intel_connector *);
--
2.1.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
