[Intel-gfx] [PATCH 13/20] drm/i915: Don't use staged config in intel_dp_mst_compute_config()

[Ander Conselvan de Oliveira]

Move towards atomic by using the legacy modeset's drm_atomic_state
instead.

Signed-off-by: Ander Conselvan de Oliveira 
<ander.conselvan.de.olive...@intel.com>
---
 drivers/gpu/drm/i915/intel_dp_mst.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c 
b/drivers/gpu/drm/i915/intel_dp_mst.c
index 5c06a06..b132fe6 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -36,11 +36,11 @@ static bool intel_dp_mst_compute_config(struct 
intel_encoder *encoder,
        struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
        struct intel_digital_port *intel_dig_port = intel_mst->primary;
        struct intel_dp *intel_dp = &intel_dig_port->dp;
-       struct drm_device *dev = encoder->base.dev;
-       int bpp;
+       struct drm_atomic_state *state;
+       int bpp, i;
        int lane_count, slots;
        struct drm_display_mode *adjusted_mode = 
&pipe_config->base.adjusted_mode;
-       struct intel_connector *found = NULL, *intel_connector;
+       struct intel_connector *found = NULL;
        int mst_pbn;
 
        pipe_config->dp_encoder_is_mst = true;
@@ -58,9 +58,14 @@ static bool intel_dp_mst_compute_config(struct intel_encoder 
*encoder,
        pipe_config->pipe_bpp = 24;
        pipe_config->port_clock = 
drm_dp_bw_code_to_link_rate(intel_dp->link_bw);
 
-       for_each_intel_connector(dev, intel_connector) {
-               if (intel_connector->new_encoder == encoder) {
-                       found = intel_connector;
+       state = pipe_config->base.state;
+
+       for (i = 0; i < state->num_connector; i++) {
+               if (!state->connectors[i])
+                       continue;
+
+               if (state->connector_states[i]->best_encoder == &encoder->base) 
{
+                       found = to_intel_connector(state->connectors[i]);
                        break;
                }
        }
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx