Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f77ad0 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Add drm_plane_mask() 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180626194716.12522-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent e35a2f9a

drivers/gpu/drm/drm_atomic.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/drm_framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */

drivers/gpu/drm/drm_simple_kms_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/drm/drm_plane.h

+12 −2
Original line number Diff line number Diff line
@@ -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