On Tue, Jun 26, 2018 at 10:47:10PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Add drm_connector_mask() which returns the 1<<index for the connector. > We already have an identical drm_crtc_mask() for crtcs. > > Mostly performed with coccinelle: > @@ > @@ > - (1<<drm_connector_index( > + drm_connector_mask( > ...) > - ) > > @@ > @@ > - 1<<drm_connector_index( > + drm_connector_mask( > ...) > > @@ > @@ > - BIT(drm_connector_index( > + drm_connector_mask( > ...) > - ) > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > --- > drivers/gpu/drm/drm_atomic.c | 6 +++--- > include/drm/drm_connector.h | 8 +++++++- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 684c9d3a1d6c..d5cefb1cb2a2 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1700,7 +1700,7 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, > conn_state->crtc); > > crtc_state->connector_mask &= > - ~(1 << drm_connector_index(conn_state->connector)); > + ~drm_connector_mask(conn_state->connector); > > drm_connector_put(conn_state->connector); > conn_state->crtc = NULL; > @@ -1712,7 +1712,7 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, > return PTR_ERR(crtc_state); > > crtc_state->connector_mask |= > - 1 << drm_connector_index(conn_state->connector); > + drm_connector_mask(conn_state->connector); > > drm_connector_get(conn_state->connector); > conn_state->crtc = crtc; > @@ -1839,7 +1839,7 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state, > */ > drm_connector_list_iter_begin(state->dev, &conn_iter); > drm_for_each_connector_iter(connector, &conn_iter) { > - if (!(crtc_state->connector_mask & (1 << drm_connector_index(connector)))) > + if (!(crtc_state->connector_mask & drm_connector_mask(connector))) > continue; > > conn_state = drm_atomic_get_connector_state(state, connector); > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 14ab58ade87f..bf0f0f0786d3 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1030,11 +1030,17 @@ int drm_mode_connector_attach_encoder(struct drm_connector *connector, > struct drm_encoder *encoder); > > void drm_connector_cleanup(struct drm_connector *connector); > -static inline unsigned drm_connector_index(struct drm_connector *connector) > + > +static inline unsigned int drm_connector_index(const struct drm_connector *connector) > { > return connector->index; > } > > +static inline u32 drm_connector_mask(const struct drm_connector *connector) > +{ > + return 1 << connector->index; > +} > + > /** > * drm_connector_lookup - lookup connector object > * @dev: DRM device > -- > 2.16.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel