[PATCH v3 01/19] drm/i915: Use crtc state in intel_modeset_pipe_config

Maarten Lankhorst
2015-06-15T10:34:13Z

Grabbing crtc state from atomic state is a lot more involved,
and make sure connectors are added before calling this function.

Move check_digital_port_conflicts to intel_modeset_checks,
it's only useful to check it on a modeset.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 39 ++++++++++++++----------------------
1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5974e995676d..d36684080987 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12044,10 +12044,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)

static int
intel_modeset_pipe_config(struct drm_crtc *crtc,
- struct drm_atomic_state *state)
+ struct intel_crtc_state *pipe_config)
{
- struct drm_crtc_state *crtc_state;
- struct intel_crtc_state *pipe_config;
+ struct drm_atomic_state *state = pipe_config->base.state;
struct intel_encoder *encoder;
struct drm_connector *connector;
struct drm_connector_state *connector_state;
@@ -12060,26 +12059,6 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
return -EINVAL;
}

- if (!check_digital_port_conflicts(state)) {
- DRM_DEBUG_KMS("rejecting conflicting digital port configuration\n");
- return -EINVAL;
- }
-
- crtc_state = drm_atomic_get_existing_crtc_state(state, crtc);
- if (WARN_ON(!crtc_state))
- return -EINVAL;
-
- pipe_config = to_intel_crtc_state(crtc_state);
-
- /*
- * XXX: Add all connectors to make the crtc state match the encoders.
- */
- if (!needs_modeset(&pipe_config->base)) {
- ret = drm_atomic_add_affected_connectors(state, crtc);
- if (ret)
- return ret;
- }
-
clear_intel_crtc_state(pipe_config);

pipe_config->cpu_transcoder =
@@ -12907,6 +12886,11 @@ static int intel_modeset_checks(struct drm_atomic_state *state)
struct drm_device *dev = state->dev;
int ret;

+ if (!check_digital_port_conflicts(state)) {
+ DRM_DEBUG_KMS("rejecting conflicting digital port configuration\n");
+ return -EINVAL;
+ }
+
/*
* See if the config requires any additional preparation, e.g.
* to adjust global state with pipes off. We need to do this
@@ -12953,7 +12937,14 @@ intel_modeset_compute_config(struct drm_atomic_state *state)
if (!crtc_state->enable)
continue;

- ret = intel_modeset_pipe_config(crtc, state);
+ if (!needs_modeset(crtc_state)) {
+ ret = drm_atomic_add_affected_connectors(state, crtc);
+ if (ret)
+ return ret;
+ }
+
+ ret = intel_modeset_pipe_config(crtc,
+ to_intel_crtc_state(crtc_state));
if (ret)
return ret;