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

Commit e4f62546 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Roll out drm_for_each_{plane,crtc,encoder} 



Remaining manual work in the drm core&helpers. Nothing special here,
no surprises.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 9e75c0ef

drivers/gpu/drm/drm_crtc.c

+14 −12
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ unsigned int drm_crtc_index(struct drm_crtc *crtc) 
	unsigned int index = 0;

	struct drm_crtc *tmp;



	list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head) {

	drm_for_each_crtc(tmp, crtc->dev) {

		if (tmp == crtc)

			return index;
@@ -1280,7 +1280,7 @@ unsigned int drm_plane_index(struct drm_plane *plane) 
	unsigned int index = 0;

	struct drm_plane *tmp;



	list_for_each_entry(tmp, &plane->dev->mode_config.plane_list, head) {

	drm_for_each_plane(tmp, plane->dev) {

		if (tmp == plane)

			return index;
@@ -1719,10 +1719,10 @@ int drm_mode_group_init_legacy_group(struct drm_device *dev, 
	if (ret)

		return ret;



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

	drm_for_each_crtc(crtc, dev)

		group->id_list[group->num_crtcs++] = crtc->base.id;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

	drm_for_each_encoder(encoder, dev)

		group->id_list[group->num_crtcs + group->num_encoders++] =

		encoder->base.id;
@@ -1811,15 +1811,17 @@ int drm_mode_getresources(struct drm_device *dev, void *data, 
	mutex_lock(&dev->mode_config.mutex);

	if (!drm_is_primary_client(file_priv)) {

		struct drm_connector *connector;

		struct drm_encoder *encoder;

		struct drm_crtc *crtc;



		mode_group = NULL;

		list_for_each(lh, &dev->mode_config.crtc_list)

		drm_for_each_crtc(crtc, dev)

			crtc_count++;



		drm_for_each_connector(connector, dev)

			connector_count++;



		list_for_each(lh, &dev->mode_config.encoder_list)

		drm_for_each_encoder(encoder, dev)

			encoder_count++;

	} else {
@@ -2287,7 +2289,7 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, 
		plane_ptr = (uint32_t __user *)(unsigned long)plane_resp->plane_id_ptr;



		/* Plane lists are invariant, no locking needed. */

		list_for_each_entry(plane, &config->plane_list, head) {

		drm_for_each_plane(plane, dev) {

			/*

			 * Unless userspace set the 'universal planes'

			 * capability bit, only advertise overlays.
@@ -2592,7 +2594,7 @@ int drm_mode_set_config_internal(struct drm_mode_set *set) 
	 * connectors from it), hence we need to refcount the fbs across all

	 * crtcs. Atomic modeset will have saner semantics ...

	 */

	list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head)

	drm_for_each_crtc(tmp, crtc->dev)

		tmp->primary->old_fb = tmp->primary->fb;



	fb = set->fb;
@@ -2603,7 +2605,7 @@ int drm_mode_set_config_internal(struct drm_mode_set *set) 
		crtc->primary->fb = fb;

	}



	list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head) {

	drm_for_each_crtc(tmp, crtc->dev) {

		if (tmp->primary->fb)

			drm_framebuffer_reference(tmp->primary->fb);

		if (tmp->primary->old_fb)
@@ -5377,15 +5379,15 @@ void drm_mode_config_reset(struct drm_device *dev) 
	struct drm_encoder *encoder;

	struct drm_connector *connector;



	list_for_each_entry(plane, &dev->mode_config.plane_list, head)

	drm_for_each_plane(plane, dev)

		if (plane->funcs->reset)

			plane->funcs->reset(plane);



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

	drm_for_each_crtc(crtc, dev)

		if (crtc->funcs->reset)

			crtc->funcs->reset(crtc);



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

	drm_for_each_encoder(encoder, dev)

		if (encoder->funcs->reset)

			encoder->funcs->reset(encoder);

drivers/gpu/drm/drm_crtc_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ bool drm_helper_crtc_in_use(struct drm_crtc *crtc) 
	if (!oops_in_progress)

		WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

	drm_for_each_encoder(encoder, dev)

		if (encoder->crtc == crtc && drm_helper_encoder_in_use(encoder))

			return true;

	return false;

drivers/gpu/drm/drm_fb_cma_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg) 
	struct drm_framebuffer *fb;



	mutex_lock(&dev->mode_config.fb_lock);

	list_for_each_entry(fb, &dev->mode_config.fb_list, head)

	drm_for_each_fb(fb, dev)

		drm_fb_cma_describe(fb, m);

	mutex_unlock(&dev->mode_config.fb_lock);

drivers/gpu/drm/drm_modeset_lock.c

+3 −4
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev) 
	if (oops_in_progress)

		return;



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

	drm_for_each_crtc(crtc, dev)

		WARN_ON(!drm_modeset_is_locked(&crtc->mutex));



	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
@@ -464,18 +464,17 @@ EXPORT_SYMBOL(drm_modeset_unlock); 
int drm_modeset_lock_all_crtcs(struct drm_device *dev,

		struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_mode_config *config = &dev->mode_config;

	struct drm_crtc *crtc;

	struct drm_plane *plane;

	int ret = 0;



	list_for_each_entry(crtc, &config->crtc_list, head) {

	drm_for_each_crtc(crtc, dev) {

		ret = drm_modeset_lock(&crtc->mutex, ctx);

		if (ret)

			return ret;

	}



	list_for_each_entry(plane, &config->plane_list, head) {

	drm_for_each_plane(plane, dev) {

		ret = drm_modeset_lock(&plane->mutex, ctx);

		if (ret)

			return ret;