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

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

drm: Move a few macros away from drm_crtc.h 



Now that there's less stuff in there I noticed that I overlooked them.
Sprinkle some docs over them while at it.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160831160913.12991-2-daniel.vetter@ffwll.ch
parent 2cc107dc

include/drm/drm_connector.h

+22 −2
Original line number Diff line number Diff line
@@ -181,14 +181,19 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, 
/**

 * struct drm_connector_state - mutable connector state

 * @connector: backpointer to the connector

 * @crtc: CRTC to connect connector to, NULL if disabled

 * @best_encoder: can be used by helpers and drivers to select the encoder

 * @state: backpointer to global drm_atomic_state

 */

struct drm_connector_state {

	struct drm_connector *connector;



	struct drm_crtc *crtc;  /* do not write directly, use drm_atomic_set_crtc_for_connector() */

	/**

	 * @crtc: CRTC to connect connector to, NULL if disabled.

	 *

	 * Do not change this directly, use drm_atomic_set_crtc_for_connector()

	 * instead.

	 */

	struct drm_crtc *crtc;



	struct drm_encoder *best_encoder;
@@ -744,4 +749,19 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector, 
int drm_mode_connector_set_tile_property(struct drm_connector *connector);

int drm_mode_connector_update_edid_property(struct drm_connector *connector,

					    const struct edid *edid);



/**

 * drm_for_each_connector - iterate over all connectors

 * @connector: the loop cursor

 * @dev: the DRM device

 *

 * Iterate over all connectors of @dev.

 */

#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))



#endif

include/drm/drm_crtc.h

+0 −32
Original line number Diff line number Diff line
@@ -2003,22 +2003,7 @@ struct drm_mode_config { 
	list_for_each_entry((plane), &(dev)->mode_config.plane_list, head) \

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



/**

 * drm_for_each_encoder_mask - iterate over encoders specified by bitmask

 * @encoder: the loop cursor

 * @dev: the DRM device

 * @encoder_mask: bitmask of encoder indices

 *

 * Iterate over all encoders specified by bitmask.

 */

#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)))



#define obj_to_crtc(x) container_of(x, struct drm_crtc, base)

#define obj_to_mode(x) container_of(x, struct drm_display_mode, base)

#define obj_to_fb(x) container_of(x, struct drm_framebuffer, base)

#define obj_to_blob(x) container_of(x, struct drm_property_blob, base)

#define obj_to_plane(x) container_of(x, struct drm_plane, base)



extern __printf(6, 7)
@@ -2186,23 +2171,6 @@ assert_drm_connector_list_read_locked(struct drm_mode_config *mode_config) 
		!drm_modeset_is_locked(&mode_config->connection_mutex));

}



#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))



#define drm_for_each_encoder(encoder, dev) \

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



#define drm_for_each_fb(fb, dev) \

	for (WARN_ON(!mutex_is_locked(&(dev)->mode_config.fb_lock)),		\

	     fb = list_first_entry(&(dev)->mode_config.fb_list,	\

					  struct drm_framebuffer, head);	\

	     &fb->head != (&(dev)->mode_config.fb_list);			\

	     fb = list_next_entry(fb, head))



/* drm_edid.c */

bool drm_probe_ddc(struct i2c_adapter *adapter);

struct edid *drm_get_edid(struct drm_connector *connector,

include/drm/drm_encoder.h

+22 −0
Original line number Diff line number Diff line
@@ -224,4 +224,26 @@ static inline struct drm_encoder *drm_encoder_find(struct drm_device *dev, 


void drm_encoder_cleanup(struct drm_encoder *encoder);



/**

 * drm_for_each_encoder_mask - iterate over encoders specified by bitmask

 * @encoder: the loop cursor

 * @dev: the DRM device

 * @encoder_mask: bitmask of encoder indices

 *

 * Iterate over all encoders specified by bitmask.

 */

#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)))



/**

 * drm_for_each_encoder - iterate over all encoders

 * @encoder: the loop cursor

 * @dev: the DRM device

 *

 * Iterate over all encoders of @dev.

 */

#define drm_for_each_encoder(encoder, dev) \

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



#endif

include/drm/drm_framebuffer.h

+17 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ struct drm_framebuffer { 
	struct list_head filp_head;

};



#define obj_to_fb(x) container_of(x, struct drm_framebuffer, base)



int drm_framebuffer_init(struct drm_device *dev,

			 struct drm_framebuffer *fb,

			 const struct drm_framebuffer_funcs *funcs);
@@ -247,4 +249,19 @@ static inline uint32_t drm_framebuffer_read_refcount(struct drm_framebuffer *fb) 
{

	return atomic_read(&fb->base.refcount.refcount);

}



/**

 * drm_for_each_fb - iterate over all framebuffers

 * @fb: the loop cursor

 * @dev: the DRM device

 *

 * Iterate over all framebuffers of @dev. User must hold the fb_lock from

 * &drm_mode_config.

 */

#define drm_for_each_fb(fb, dev) \

	for (WARN_ON(!mutex_is_locked(&(dev)->mode_config.fb_lock)),		\

	     fb = list_first_entry(&(dev)->mode_config.fb_list,	\

					  struct drm_framebuffer, head);	\

	     &fb->head != (&(dev)->mode_config.fb_list);			\

	     fb = list_next_entry(fb, head))

#endif

include/drm/drm_modes.h

+2 −0
Original line number Diff line number Diff line
@@ -403,6 +403,8 @@ struct drm_display_mode { 
	enum hdmi_picture_aspect picture_aspect_ratio;

};



#define obj_to_mode(x) container_of(x, struct drm_display_mode, base)



/**

 * drm_mode_is_stereo - check for stereo mode flags

 * @mode: drm_display_mode to check