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

Commit 347e8903 authored Dec 29, 2016 by Daniel Vetter

drm: Nuke connector_list locking assert



I've forgotten to remove this when revamping the
connector_list locking.

Cc: seanpaul@chromium.org
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1483044517-5770-7-git-send-email-daniel.vetter@ffwll.ch

parent ea0dd85a

include/drm/drm_connector.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -875,11 +875,7 @@ void drm_mode_put_tile_group(struct drm_device *dev,
		* deprecated. Use drm_for_each_connector_iter() instead.
		*/
		#define drm_for_each_connector(connector, dev) \
		for (assert_drm_connector_list_read_locked(&(dev)->mode_config), \
		connector = list_first_entry(&(dev)->mode_config.connector_list, \
		struct drm_connector, head); \
		&connector->head != (&(dev)->mode_config.connector_list); \
		connector = list_next_entry(connector, head))
		list_for_each_entry(connector, &(dev)->mode_config.connector_list, head)

		/**
		* struct drm_connector_list_iter - connector_list iterator

include/drm/drm_crtc.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -836,18 +836,4 @@ static inline struct drm_crtc drm_crtc_find(struct drm_device dev,
		#define drm_for_each_crtc(crtc, dev) \
		list_for_each_entry(crtc, &(dev)->mode_config.crtc_list, head)

		static inline void
		assert_drm_connector_list_read_locked(struct drm_mode_config *mode_config)
		{
		/*
		* The connector hotadd/remove code currently grabs both locks when
		* updating lists. Hence readers need only hold either of them to be
		* safe and the check amounts to
		*
		* WARN_ON(not_holding(A) && not_holding(B)).
		*/
		WARN_ON(!mutex_is_locked(&mode_config->mutex) &&
		!drm_modeset_is_locked(&mode_config->connection_mutex));
		}

		#endif /* __DRM_CRTC_H__ */