Commit 5351bbdd authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/atomic: Make add_affected_connectors look at crtc_state.

This kills another dereference of connector->state. connector_mask
holds all unchanged connectors at least and any changed connectors
are already in state anyway.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1484559464-27107-3-git-send-email-maarten.lankhorst@linux.intel.com
parent 581e49fe
...@@ -1414,8 +1414,13 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state, ...@@ -1414,8 +1414,13 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state,
struct drm_connector *connector; struct drm_connector *connector;
struct drm_connector_state *conn_state; struct drm_connector_state *conn_state;
struct drm_connector_list_iter conn_iter; struct drm_connector_list_iter conn_iter;
struct drm_crtc_state *crtc_state;
int ret; int ret;
crtc_state = drm_atomic_get_crtc_state(state, crtc);
if (IS_ERR(crtc_state))
return PTR_ERR(crtc_state);
ret = drm_modeset_lock(&config->connection_mutex, state->acquire_ctx); ret = drm_modeset_lock(&config->connection_mutex, state->acquire_ctx);
if (ret) if (ret)
return ret; return ret;
...@@ -1424,12 +1429,12 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state, ...@@ -1424,12 +1429,12 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state,
crtc->base.id, crtc->name, state); crtc->base.id, crtc->name, state);
/* /*
* Changed connectors are already in @state, so only need to look at the * Changed connectors are already in @state, so only need to look
* current configuration. * at the connector_mask in crtc_state.
*/ */
drm_connector_list_iter_get(state->dev, &conn_iter); drm_connector_list_iter_get(state->dev, &conn_iter);
drm_for_each_connector_iter(connector, &conn_iter) { drm_for_each_connector_iter(connector, &conn_iter) {
if (connector->state->crtc != crtc) if (!(crtc_state->connector_mask & (1 << drm_connector_index(connector))))
continue; continue;
conn_state = drm_atomic_get_connector_state(state, connector); conn_state = drm_atomic_get_connector_state(state, connector);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment