On Tue, Jun 26, 2018 at 10:47:08PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

Use drm_crtc_mask() where appropriate.

Mostly performed with coccinelle: @@ @@

• (1<<drm_crtc_index(

• drm_crtc_mask( ...)

• )

@@ @@

• 1<<drm_crtc_index(

• drm_crtc_mask( ...)

@@ @@

• BIT(drm_crtc_index(

• drm_crtc_mask( ...)

• )

Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

drivers/gpu/drm/drm_crtc.c | 4 ++-- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index f45e7a8d4acd..c762e75a2d94 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -329,9 +329,9 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, crtc->primary = primary; crtc->cursor = cursor; if (primary && !primary->possible_crtcs)

• primary->possible_crtcs = 1 << drm_crtc_index(crtc);
  

• primary->possible_crtcs = drm_crtc_mask(crtc);
  

  if (cursor && !cursor->possible_crtcs)

• cursor->possible_crtcs = 1 << drm_crtc_index(crtc);
  

• cursor->possible_crtcs = drm_crtc_mask(crtc);
  
  

  ret = drm_crtc_crc_init(crtc); if (ret) {

diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c index 9d87961da1db..b72fcf1e9605 100644 --- a/drivers/gpu/drm/drm_simple_kms_helper.c +++ b/drivers/gpu/drm/drm_simple_kms_helper.c @@ -281,7 +281,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev, if (ret) return ret;

• encoder->possible_crtcs = 1 << drm_crtc_index(crtc);

• encoder->possible_crtcs = drm_crtc_mask(crtc); ret = drm_encoder_init(dev, encoder, &drm_simple_kms_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); if (ret || !connector)

-- 2.16.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Jun 26, 2018 at 10:47:09PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

Add drm_encoder_mask() which returns the 1<<index for the encoder. We already have an identical drm_crtc_mask() for crtcs.

Mostly performed with coccinelle: @@ @@

• (1<<drm_encoder_index(

• drm_encoder_mask( ...)

• )

@@ @@

• 1<<drm_encoder_index(

• drm_encoder_mask( ...)

@@ @@

• BIT(drm_encoder_index(

• drm_encoder_mask( ...)

• )

Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

drivers/gpu/drm/drm_atomic_helper.c | 10 +++++----- include/drm/drm_encoder.h | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 17baf5057132..e022cacdae34 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -121,7 +121,7 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, new_encoder = drm_atomic_helper_best_encoder(connector);

if (new_encoder) {

• 	if (encoder_mask & (1 << drm_encoder_index(new_encoder))) {
  

• 	if (encoder_mask & drm_encoder_mask(new_encoder)) {
  	DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] on [CONNECTOR:%d:%s] already assigned\n",
  		new_encoder->base.id, new_encoder->name,
  		connector->base.id, connector->name);
  

@@ -129,7 +129,7 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, return -EINVAL; }

• 	encoder_mask |= 1 << drm_encoder_index(new_encoder);
  

• 	encoder_mask |= drm_encoder_mask(new_encoder);
  

  } }

@@ -155,7 +155,7 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, continue;

encoder = connector->state->best_encoder;

• if (!encoder || !(encoder_mask & (1 << drm_encoder_index(encoder))))
  

• if (!encoder || !(encoder_mask & drm_encoder_mask(encoder)))
  continue;
  
  

  if (!disable_conflicting_encoders) {

@@ -223,7 +223,7 @@ set_best_encoder(struct drm_atomic_state *state, crtc_state = drm_atomic_get_new_crtc_state(state, crtc);

	crtc_state->encoder_mask &=

• 		~(1 << drm_encoder_index(conn_state->best_encoder));
  

• 		~drm_encoder_mask(conn_state->best_encoder);
  

  } }

@@ -234,7 +234,7 @@ set_best_encoder(struct drm_atomic_state *state, crtc_state = drm_atomic_get_new_crtc_state(state, crtc);

	crtc_state->encoder_mask |=

• 		1 << drm_encoder_index(encoder);
  

• 		drm_encoder_mask(encoder);
  

  } }

diff --git a/include/drm/drm_encoder.h b/include/drm/drm_encoder.h index fb299696c7c4..4f597c0730b4 100644 --- a/include/drm/drm_encoder.h +++ b/include/drm/drm_encoder.h @@ -191,11 +191,23 @@ int drm_encoder_init(struct drm_device *dev,

• Given a registered encoder, return the index of that encoder within a DRM
• device's list of encoders.

*/ -static inline unsigned int drm_encoder_index(struct drm_encoder *encoder) +static inline unsigned int drm_encoder_index(const struct drm_encoder *encoder) { return encoder->index; }

+/**

• • drm_encoder_mask - find the mask of a registered ENCODER
• • @encoder: encoder to find mask for
• • Given a registered encoder, return the mask bit of that encoder for an
• • encoder's possible_clones field.
• */

+static inline u32 drm_encoder_mask(const struct drm_encoder *encoder) +{

• return 1 << drm_encoder_index(encoder);

+}

/**

• drm_encoder_crtc_ok - can a given crtc drive a given encoder?
• @encoder: encoder to test

@@ -241,7 +253,7 @@ void drm_encoder_cleanup(struct drm_encoder *encoder); */ #define drm_for_each_encoder_mask(encoder, dev, encoder_mask) \ list_for_each_entry((encoder), &(dev)->mode_config.encoder_list, head) \

• for_each_if ((encoder_mask) & (1 << drm_encoder_index(encoder)))
  

• for_each_if ((encoder_mask) & drm_encoder_mask(encoder))
  
  

/**

• drm_for_each_encoder - iterate over all encoders

-- 2.16.4

---

Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

On Tue, Jun 26, 2018 at 10:47:10PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

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@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

On Tue, Jun 26, 2018 at 10:47:11PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

Use drm_{plane,crtc,encoder,connector}_mask() where appropriate.

Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

drivers/gpu/drm/i915/intel_display.c | 14 +++++++------- drivers/gpu/drm/i915/intel_display.h | 4 ++-- drivers/gpu/drm/i915/intel_dpll_mgr.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index eaa0663963a5..7cc70e751c82 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2756,10 +2756,10 @@ intel_set_plane_visible(struct intel_crtc_state *crtc_state,

/* FIXME pre-g4x don't work like this */ if (visible) {

• crtc_state->base.plane_mask |= BIT(drm_plane_index(&plane->base));
  

• crtc_state->base.plane_mask |= drm_plane_mask(&plane->base);
  

  crtc_state->active_planes |= BIT(plane->id); } else {

• crtc_state->base.plane_mask &= ~BIT(drm_plane_index(&plane->base));
  

• crtc_state->base.plane_mask &= ~drm_plane_mask(&plane->base);
  

  crtc_state->active_planes &= ~BIT(plane->id); }

@@ -11896,7 +11896,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv, struct drm_crtc_state *new_state) { struct intel_dpll_hw_state dpll_hw_state;

• unsigned crtc_mask;

• unsigned int crtc_mask; bool active;

  memset(&dpll_hw_state, 0, sizeof(dpll_hw_state));

@@ -11923,7 +11923,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv, return; }

• crtc_mask = 1 << drm_crtc_index(crtc);

• crtc_mask = drm_crtc_mask(crtc);

  if (new_state->active) I915_STATE_WARN(!(pll->active_mask & crtc_mask),

@@ -11958,7 +11958,7 @@ verify_shared_dpll_state(struct drm_device *dev, struct drm_crtc *crtc,

if (old_state->shared_dpll && old_state->shared_dpll != new_state->shared_dpll) {

• unsigned crtc_mask = 1 << drm_crtc_index(crtc);
  

• unsigned int crtc_mask = drm_crtc_mask(crtc);
  

  struct intel_shared_dpll *pll = old_state->shared_dpll;

  I915_STATE_WARN(pll->active_mask & crtc_mask,

@@ -15636,9 +15636,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) * rely on the connector_mask being accurate. */ encoder->base.crtc->state->connector_mask |=

• 			1 << drm_connector_index(&connector->base);
  

• 			drm_connector_mask(&connector->base);
  	encoder->base.crtc->state->encoder_mask |=
  

• 			1 << drm_encoder_index(&encoder->base);
  

• 			drm_encoder_mask(&encoder->base);
  }
  
  

  } else {

diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h index dfb02da73ac8..dd30cae5eb00 100644 --- a/drivers/gpu/drm/i915/intel_display.h +++ b/drivers/gpu/drm/i915/intel_display.h @@ -261,7 +261,7 @@ struct intel_link_m_n { &(dev)->mode_config.plane_list, \ base.head) \ for_each_if((plane_mask) & \

• 	    BIT(drm_plane_index(&intel_plane->base)))
  

• 	    drm_plane_mask(&intel_plane->base)))
  
  

#define for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) \ list_for_each_entry(intel_plane, \ @@ -278,7 +278,7 @@ struct intel_link_m_n { list_for_each_entry(intel_crtc, \ &(dev)->mode_config.crtc_list, \ base.head) \

• for_each_if((crtc_mask) & BIT(drm_crtc_index(&intel_crtc->base)))
  

• for_each_if((crtc_mask) & drm_crtc_mask(&intel_crtc->base))
  
  

#define for_each_intel_encoder(dev, intel_encoder) \ list_for_each_entry(intel_encoder, \ diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c index 57342364fd30..e4ac7f980c9e 100644 --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c @@ -163,8 +163,8 @@ void intel_enable_shared_dpll(struct intel_crtc *crtc) struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); struct intel_shared_dpll *pll = crtc->config->shared_dpll;

• unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
• unsigned old_mask;

• unsigned int crtc_mask = drm_crtc_mask(&crtc->base);

• unsigned int old_mask;

  if (WARN_ON(pll == NULL)) return;

@@ -207,7 +207,7 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc) { struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct intel_shared_dpll *pll = crtc->config->shared_dpll;

• unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);

• unsigned int crtc_mask = drm_crtc_mask(&crtc->base);

  /* PCH only available on ILK+ */ if (INTEL_GEN(dev_priv) < 5)

-- 2.16.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Jun 26, 2018 at 10:47:12PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

Use drm_plane_mask() where appropriate.

Cc: Philipp Zabel p.zabel@pengutronix.de Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index e83af0f2be86..21d002859ae0 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -213,7 +213,7 @@ static bool ipu_crtc_mode_fixup(struct drm_crtc *crtc, static int ipu_crtc_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *state) {

• u32 primary_plane_mask = 1 << drm_plane_index(crtc->primary);

• u32 primary_plane_mask = drm_plane_mask(crtc->primary);

  if (state->active && (primary_plane_mask & state->plane_mask) == 0) return -EINVAL;

-- 2.16.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Jun 26, 2018 at 10:47:14PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

Use drm_crtc_mask() where appropriate.

Cc: Maxime Ripard maxime.ripard@bootlin.com Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index 2d7c57406715..3eedf335a935 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -242,7 +242,7 @@ struct sun4i_crtc *sun4i_crtc_init(struct drm_device *drm,

/* Set possible_crtcs to this crtc for overlay planes */ for (i = 0; planes[i]; i++) {

• uint32_t possible_crtcs = BIT(drm_crtc_index(&scrtc->crtc));
  

• uint32_t possible_crtcs = drm_crtc_mask(&scrtc->crtc);
  

  struct drm_plane *plane = planes[i];

  if (plane->type == DRM_PLANE_TYPE_OVERLAY)

diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c index be3f14d7746d..a69fe2e1f9d1 100644 --- a/drivers/gpu/drm/sun4i/sun4i_lvds.c +++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c @@ -136,7 +136,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon) }

/* The LVDS encoder can only work with the TCON channel 0 */

• lvds->encoder.possible_crtcs = BIT(drm_crtc_index(&tcon->crtc->crtc));

• lvds->encoder.possible_crtcs = drm_crtc_mask(&tcon->crtc->crtc);

  if (tcon->panel) { drm_connector_helper_add(&lvds->connector,

diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c index f2fa1f210509..96d21b07f8fc 100644 --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c @@ -202,7 +202,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon) }

/* The RGB encoder can only work with the TCON channel 0 */

• rgb->encoder.possible_crtcs = BIT(drm_crtc_index(&tcon->crtc->crtc));

• rgb->encoder.possible_crtcs = drm_crtc_mask(&tcon->crtc->crtc);

  if (tcon->panel) { drm_connector_helper_add(&rgb->connector,

-- 2.16.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Tue, Jun 26, 2018 at 10:47:16PM +0300, Ville Syrjala wrote:

From: Ville Syrjälä ville.syrjala@linux.intel.com

Use drm_{plane,connector}_mask() where appropriate.

Cc: VMware Graphics linux-graphics-maintainer@vmware.com Cc: Sinclair Yeh syeh@vmware.com Cc: Thomas Hellstrom thellstrom@vmware.com Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

---

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index ef96ba7432ad..17e01423ead1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -535,9 +535,9 @@ int vmw_du_crtc_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *new_state) { struct vmw_display_unit *du = vmw_crtc_to_du(new_state->crtc);

• int connector_mask = 1 << drm_connector_index(&du->connector);

• int connector_mask = drm_connector_mask(&du->connector); bool has_primary = new_state->plane_mask &

• 	   BIT(drm_plane_index(crtc->primary));
  

• 	   drm_plane_mask(crtc->primary);
  
  

  /* We always want to have an active plane with an active CRTC */ if (has_primary != new_state->enable)

-- 2.16.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

On Mon, Jul 02, 2018 at 10:00:35AM -0700, Sinclair Yeh wrote:

Reviewed-by: Sinclair Yeh syeh@vmware.com

I assume you'll upstream this as part of your series?

Already pushed actually. In my haste I failed to realize I was still missing an ack/rb for vmwgfx. Sorry about that.

On Tue, Jun 26, 2018 at 10:47:16PM +0300, Ville Syrjala wrote:

...

From: Ville Syrjälä ville.syrjala@linux.intel.com

Use drm_{plane,connector}_mask() where appropriate.

Cc: VMware Graphics linux-graphics-maintainer@vmware.com Cc: Sinclair Yeh syeh@vmware.com Cc: Thomas Hellstrom thellstrom@vmware.com Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

---

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index ef96ba7432ad..17e01423ead1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -535,9 +535,9 @@ int vmw_du_crtc_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *new_state) { struct vmw_display_unit *du = vmw_crtc_to_du(new_state->crtc);

• int connector_mask = 1 << drm_connector_index(&du->connector);

• int connector_mask = drm_connector_mask(&du->connector); bool has_primary = new_state->plane_mask &

• 	   BIT(drm_plane_index(crtc->primary));
  

• 	   drm_plane_mask(crtc->primary);
  
  

  /* We always want to have an active plane with an active CRTC */ if (has_primary != new_state->enable)

-- 2.16.4

On Tue, Jun 26, 2018 at 01:09:53PM -0700, Rodrigo Vivi wrote:

On Tue, Jun 26, 2018 at 10:47:07PM +0300, Ville Syrjala wrote:

...

From: Ville Syrjälä ville.syrjala@linux.intel.com

Add drm_plane_mask() which returns the 1<<index for the plane. We already have an identical drm_crtc_mask() for crtcs.

Mostly performed with coccinelle: @@ @@

• (1<<drm_plane_index(

• drm_plane_mask( ...)

• )

@@ @@

• 1<<drm_plane_index(

• drm_plane_mask( ...)

@@ @@

• BIT(drm_plane_index(

• drm_plane_mask( ...)

• )

Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com

Reviewed-by: Rodrigo Vivi rodrigo.vivi@intel.com

Series pushed to drm-misc-next. Thanks for the reviews/acks.

...

---

drivers/gpu/drm/drm_atomic.c | 4 ++-- drivers/gpu/drm/drm_framebuffer.c | 2 +- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- include/drm/drm_plane.h | 14 ++++++++++++-- 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 178842380f75..684c9d3a1d6c 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1581,7 +1581,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, if (WARN_ON(IS_ERR(crtc_state))) return PTR_ERR(crtc_state);

• crtc_state->plane_mask &= ~(1 << drm_plane_index(plane));
  

• crtc_state->plane_mask &= ~drm_plane_mask(plane);
  

  }

  plane_state->crtc = crtc;

@@ -1591,7 +1591,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, crtc); if (IS_ERR(crtc_state)) return PTR_ERR(crtc_state);

• crtc_state->plane_mask |= (1 << drm_plane_index(plane));
  

• crtc_state->plane_mask |= drm_plane_mask(plane);
  

  }

  if (crtc)

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c index ed90974a452a..781af1d42d76 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -847,7 +847,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb) if (ret) goto unlock;

• plane_mask |= BIT(drm_plane_index(plane));
  

• plane_mask |= drm_plane_mask(plane);
  

  }

  /* This list is only filled when disable_crtcs is set. */

diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c index 7a00455ca568..9d87961da1db 100644 --- a/drivers/gpu/drm/drm_simple_kms_helper.c +++ b/drivers/gpu/drm/drm_simple_kms_helper.c @@ -52,7 +52,7 @@ static int drm_simple_kms_crtc_check(struct drm_crtc *crtc, struct drm_crtc_state *state) { bool has_primary = state->plane_mask &

• 	   BIT(drm_plane_index(crtc->primary));
  

• 	   drm_plane_mask(crtc->primary);
  
  

  /* We always want to have an active plane with an active CRTC */ if (has_primary != state->enable)

diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 7d4d6c7f0afd..cee9dfaaa740 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -639,10 +639,20 @@ void drm_plane_cleanup(struct drm_plane *plane);

• Given a registered plane, return the index of that plane within a DRM
• device's list of planes.

*/ -static inline unsigned int drm_plane_index(struct drm_plane *plane) +static inline unsigned int drm_plane_index(const struct drm_plane *plane) { return plane->index; }

+/**

• • drm_plane_mask - find the mask of a registered plane
• • @plane: plane to find mask for
• */

+static inline u32 drm_plane_mask(const struct drm_plane *plane) +{

• return 1 << drm_plane_index(plane);

+}

struct drm_plane * drm_plane_from_index(struct drm_device *dev, int idx); void drm_plane_force_disable(struct drm_plane *plane);

@@ -678,7 +688,7 @@ static inline struct drm_plane *drm_plane_find(struct drm_device *dev, */ #define drm_for_each_plane_mask(plane, dev, plane_mask) \ list_for_each_entry((plane), &(dev)->mode_config.plane_list, head) \

• for_each_if ((plane_mask) & (1 << drm_plane_index(plane)))
  

• for_each_if ((plane_mask) & drm_plane_mask(plane))
  
  

/**

• drm_for_each_legacy_plane - iterate over all planes for legacy userspace

-- 2.16.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel