On Thu, May 11, 2017 at 04:10:44PM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan <[email protected]> > > Drop legacy drm_for_each_connector() in favor of the race-free > drm_for_each_connector_iter(). > > Cc: Daniel Vetter <[email protected]> > Cc: Jani Nikula <[email protected]> > Signed-off-by: Gustavo Padovan <[email protected]> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 3617927..207f144 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -11216,6 +11216,7 @@ static bool check_digital_port_conflicts(struct > drm_atomic_state *state) > { > struct drm_device *dev = state->dev; > struct drm_connector *connector; > + struct drm_connector_list_iter conn_iter; > unsigned int used_ports = 0; > unsigned int used_mst_ports = 0; > > @@ -11224,7 +11225,8 @@ static bool check_digital_port_conflicts(struct > drm_atomic_state *state) > * list to detect the problem on ddi platforms > * where there's just one encoder per digital port. > */ > - drm_for_each_connector(connector, dev) { > + drm_connector_list_iter_begin(dev, &conn_iter); > + drm_for_each_connector_iter(connector, &conn_iter) {
Since this checks an atomic state it'd probably be better to use for_each_new_connector_in_state (to make sure we check the same connectors as in the atomic state, and not something else due to hotplug changes meanwhile). But this is ok as the mechanical change, so Reviewed-by: Daniel Vetter <[email protected]> > struct drm_connector_state *connector_state; > struct intel_encoder *encoder; > > @@ -11263,6 +11265,7 @@ static bool check_digital_port_conflicts(struct > drm_atomic_state *state) > break; > } > } > + drm_connector_list_iter_end(&conn_iter); > > /* can't mix MST and SST/HDMI on the same port */ > if (used_ports & used_mst_ports) > -- > 2.9.3 > > _______________________________________________ > dri-devel mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
