diff options
| author | Ander Conselvan de Oliveira | 2015-03-20 15:18:08 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-03-26 17:49:52 +0100 |
| commit | 0b9018793939970aad49e4e0ed21f0fd0db74e4a (patch) | |
| tree | 9847655f9d393046a8ba7285915cc8b20326014b /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Copy the staged connector config to the legacy atomic state (diff) | |
| download | kernel-qcow2-linux-0b9018793939970aad49e4e0ed21f0fd0db74e4a.tar.gz kernel-qcow2-linux-0b9018793939970aad49e4e0ed21f0fd0db74e4a.tar.xz kernel-qcow2-linux-0b9018793939970aad49e4e0ed21f0fd0db74e4a.zip | |
drm/i915: Don't use encoder->new_crtc in intel_modeset_pipe_config()
Move towards atomic by using the legacy modeset's drm_atomic_state
instead.
v2: Move call to drm_atomic_add_affected_connectors() to
intel_modeset_compute_config(). (Daniel)
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
[danvet: Resurrect the ret local variable which I've dropped from an
earlier patch and which is now needed.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c0fa9df51008..afceb5836af7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10538,8 +10538,11 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, { struct drm_device *dev = crtc->dev; struct intel_encoder *encoder; + struct intel_connector *connector; + struct drm_connector_state *connector_state; struct intel_crtc_state *pipe_config; int plane_bpp, ret = -EINVAL; + int i; bool retry = true; if (!check_encoder_cloning(to_intel_crtc(crtc))) { @@ -10613,11 +10616,17 @@ encoder_retry: * adjust it according to limitations or connector properties, and also * a chance to reject the mode entirely. */ - for_each_intel_encoder(dev, encoder) { + for (i = 0; i < state->num_connector; i++) { + connector = to_intel_connector(state->connectors[i]); + if (!connector) + continue; - if (&encoder->new_crtc->base != crtc) + connector_state = state->connector_states[i]; + if (connector_state->crtc != crtc) continue; + encoder = to_intel_encoder(connector_state->best_encoder); + if (!(encoder->compute_config(encoder, pipe_config))) { DRM_DEBUG_KMS("Encoder config failure\n"); goto fail; @@ -11339,6 +11348,11 @@ intel_modeset_compute_config(struct drm_crtc *crtc, struct drm_device *dev = crtc->dev; struct intel_crtc_state *pipe_config = NULL; struct intel_crtc *intel_crtc; + int ret = 0; + + ret = drm_atomic_add_affected_connectors(state, crtc); + if (ret) + return ERR_PTR(ret); intel_modeset_affected_pipes(crtc, modeset_pipes, prepare_pipes, disable_pipes); |