Commit 4cd9fa52 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/atomic: add connector mask to drm_crtc_state.

It can be useful to iterate over connectors without grabbing
connection_mutex. It can also be used to see how many connectors
are on a crtc without iterating over the list.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1451908400-25147-4-git-send-email-maarten.lankhorst@linux.intel.comSigned-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5459a2ad
...@@ -1063,10 +1063,21 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, ...@@ -1063,10 +1063,21 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
{ {
struct drm_crtc_state *crtc_state; struct drm_crtc_state *crtc_state;
if (conn_state->crtc && conn_state->crtc != crtc) {
crtc_state = drm_atomic_get_existing_crtc_state(conn_state->state,
conn_state->crtc);
crtc_state->connector_mask &=
~(1 << drm_connector_index(conn_state->connector));
}
if (crtc) { if (crtc) {
crtc_state = drm_atomic_get_crtc_state(conn_state->state, crtc); crtc_state = drm_atomic_get_crtc_state(conn_state->state, crtc);
if (IS_ERR(crtc_state)) if (IS_ERR(crtc_state))
return PTR_ERR(crtc_state); return PTR_ERR(crtc_state);
crtc_state->connector_mask |=
1 << drm_connector_index(conn_state->connector);
} }
conn_state->crtc = crtc; conn_state->crtc = crtc;
......
...@@ -306,6 +306,7 @@ struct drm_plane_helper_funcs; ...@@ -306,6 +306,7 @@ struct drm_plane_helper_funcs;
* @active_changed: crtc_state->active has been toggled. * @active_changed: crtc_state->active has been toggled.
* @connectors_changed: connectors to this crtc have been updated * @connectors_changed: connectors to this crtc have been updated
* @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes * @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes
* @connector_mask: bitmask of (1 << drm_connector_index(connector)) of attached connectors
* @last_vblank_count: for helpers and drivers to capture the vblank of the * @last_vblank_count: for helpers and drivers to capture the vblank of the
* update to ensure framebuffer cleanup isn't done too early * update to ensure framebuffer cleanup isn't done too early
* @adjusted_mode: for use by helpers and drivers to compute adjusted mode timings * @adjusted_mode: for use by helpers and drivers to compute adjusted mode timings
...@@ -339,6 +340,8 @@ struct drm_crtc_state { ...@@ -339,6 +340,8 @@ struct drm_crtc_state {
*/ */
u32 plane_mask; u32 plane_mask;
u32 connector_mask;
/* last_vblank_count: for vblank waits before cleanup */ /* last_vblank_count: for vblank waits before cleanup */
u32 last_vblank_count; u32 last_vblank_count;
......
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