On Mon, Jan 04, 2016 at 12:53:18PM +0100, Maarten Lankhorst wrote:
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: Maarten Lankhorst maarten.lankhorst@linux.intel.com
Merged up to this patch here, thanks. -Daniel
drivers/gpu/drm/drm_atomic.c | 11 +++++++++++ include/drm/drm_crtc.h | 3 +++ 2 files changed, 14 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 6a21e5c378c1..14b321580517 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1063,10 +1063,21 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_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) { crtc_state = drm_atomic_get_crtc_state(conn_state->state, crtc); if (IS_ERR(crtc_state)) return PTR_ERR(crtc_state);
crtc_state->connector_mask |=1 << drm_connector_index(conn_state->connector);}
conn_state->crtc = crtc;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index c2f98ba2bb98..dd0db4ceab26 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -301,6 +301,7 @@ struct drm_plane_helper_funcs;
- @active_changed: crtc_state->active has been toggled.
- @connectors_changed: connectors to this crtc have been updated
- @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
- update to ensure framebuffer cleanup isn't done too early
- @adjusted_mode: for use by helpers and drivers to compute adjusted mode timings
@@ -334,6 +335,8 @@ struct drm_crtc_state { */ u32 plane_mask;
- u32 connector_mask;
- /* last_vblank_count: for vblank waits before cleanup */ u32 last_vblank_count;
-- 2.1.0
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx