WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_modes.c

 #include
 #include
 #include
 #include
 #include
+#include
+#include "drm_crtc_internal.h"
 /**
- * drm_mode_debug_printmodeline - debug print a mode
- * @dev: DRM device
+ * drm_mode_debug_printmodeline - print a mode to dmesg
  * @mode: mode to print
- *
- * LOCKING:
- * None.
+ *
  * Describe @mode using DRM_DEBUG.
  */
 void drm_mode_debug_printmodeline(const struct drm_display_mode *mode)
+{
 		mode->vsync_end, mode->vtotal, mode->type, mode->flags);
+}
 EXPORT_SYMBOL(drm_mode_debug_printmodeline);
 /**
- * drm_cvt_mode -create a modeline based on CVT algorithm
+ * drm_mode_create - create a new display mode
+ * @dev: DRM device
+ *
+ * Create a new, cleared drm_display_mode with kzalloc, allocate an ID for it
+ * and return it.
+ *
+ * Returns:
+ * Pointer to new mode on success, NULL on error.
+ */
+struct drm_display_mode *drm_mode_create(struct drm_device *dev)
+{
+	struct drm_display_mode *nmode;
+	nmode = kzalloc(sizeof(struct drm_display_mode), GFP_KERNEL);
+	if (!nmode)
+		return NULL;
+	if (drm_mode_object_get(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) {
+		kfree(nmode);
+		return NULL;
+	}
+	return nmode;
+}
+EXPORT_SYMBOL(drm_mode_create);
+/**
+ * drm_mode_destroy - remove a mode
+ * @dev: DRM device
+ * @mode: mode to remove
+ *
+ * Release @mode's unique ID, then free it @mode structure itself using kfree.
+ */
+void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode)
+{
+	if (!mode)
+		return;
+	drm_mode_object_put(dev, &mode->base);
+	kfree(mode);
+}
+EXPORT_SYMBOL(drm_mode_destroy);
+/**
+ * drm_mode_probed_add - add a mode to a connector's probed_mode list
+ * @connector: connector the new mode
+ * @mode: mode data
+ *
+ * Add @mode to @connector's probed_mode list for later use. This list should
+ * then in a second step get filtered and all the modes actually supported by
+ * the hardware moved to the @connector's modes list.
+ */
+void drm_mode_probed_add(struct drm_connector *connector,
+			 struct drm_display_mode *mode)
+{
+	WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex));
+	list_add_tail(&mode->head, &connector->probed_modes);
+}
+EXPORT_SYMBOL(drm_mode_probed_add);
+/**
+ * drm_cvt_mode -create a modeline based on the CVT algorithm
- * @dev: DRM device
+ * @dev: drm device
  * @hdisplay: hdisplay size
  * @vdisplay: vdisplay size
- * @vrefresh  : vrefresh rate
+ * @vrefresh: vrefresh rate
- * @reduced : Whether the GTF calculation is simplified
+ * @reduced: whether to use reduced blanking
- * @interlaced:Whether the interlace is supported
- *
- * LOCKING:
- * none.
- *
+ * @interlaced: whether to compute an interlaced mode
- * return the modeline based on CVT algorithm
+ * @margins: whether to add margins (borders)
+ *
  * This function is called to generate the modeline based on CVT algorithm
  * according to the hdisplay, vdisplay, vrefresh.
  * It is based from the VESA(TM) Coordinated Video Timing Generator by
  * Graham Loveridge April 9, 2003 available at
  * http://www.elo.utfsm.cl/~elo212/docs/CVTd6r1.xls
+ *
  * And it is copied from xf86CVTmode in xserver/hw/xfree86/modes/xf86cvt.c.
+ * What I have done is to translate it by using integer calculation.
+ *
+ * Returns:
+ * The modeline based on the CVT algorithm stored in a drm_display_mode object.
+ * The display mode object is allocated with drm_mode_create(). Returns NULL
- * What I have done is to translate it by using integer calculation.
+ * when no mode could be allocated.
- */
-#define HV_FACTOR			1000
+ */
 struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, int hdisplay,
 				      int vdisplay, int vrefresh,
 				      bool reduced, bool interlaced, bool margins)
+{
 #define HV_FACTOR			1000
 	/* 1) top/bottom margin size (% of height) - default: 1.8, */
 #define	CVT_MARGIN_PERCENTAGE		18
 	/* 2) character cell horizontal granularity (pixels) - default 8 */
 #define	CVT_H_GRANULARITY		8
     return drm_mode;
+}
 EXPORT_SYMBOL(drm_cvt_mode);
 /**
- * drm_gtf_mode_complex - create the modeline based on full GTF algorithm
  * drm_gtf_mode_complex - create the modeline based on the full GTF algorithm
- * @dev		:drm device
+ * @dev: drm device
- * @hdisplay	:hdisplay size
+ * @hdisplay: hdisplay size
- * @vdisplay	:vdisplay size
+ * @vdisplay: vdisplay size
- * @vrefresh	:vrefresh rate.
+ * @vrefresh: vrefresh rate.
- * @interlaced	:whether the interlace is supported
+ * @interlaced: whether to compute an interlaced mode
- * @margins	:desired margin size
+ * @margins: desired margin (borders) size
- * @GTF_[MCKJ]  :extended GTF formula parameters
- *
+ * @GTF_M: extended GTF formula parameters
- * LOCKING.
+ * @GTF_2C: extended GTF formula parameters
- * none.
- *
+ * @GTF_K: extended GTF formula parameters
- * return the modeline based on full GTF algorithm.
+ * @GTF_2J: extended GTF formula parameters
+ *
  * GTF feature blocks specify C and J in multiples of 0.5, so we pass them
+ * in here multiplied by two.  For a C of 40, pass in 80.
+ *
+ * Returns:
+ * The modeline based on the full GTF algorithm stored in a drm_display_mode object.
+ * The display mode object is allocated with drm_mode_create(). Returns NULL
- * in here multiplied by two.  For a C of 40, pass in 80.
+ * when no mode could be allocated.
  */
 struct drm_display_mode *
 drm_gtf_mode_complex(struct drm_device *dev, int hdisplay, int vdisplay,
 		     int vrefresh, bool interlaced, int margins,
 	return drm_mode;
+}
 EXPORT_SYMBOL(drm_gtf_mode_complex);
 /**
- * drm_gtf_mode - create the modeline based on GTF algorithm
  * drm_gtf_mode - create the modeline based on the GTF algorithm
- * @dev		:drm device
+ * @dev: drm device
- * @hdisplay	:hdisplay size
+ * @hdisplay: hdisplay size
- * @vdisplay	:vdisplay size
+ * @vdisplay: vdisplay size
- * @vrefresh	:vrefresh rate.
+ * @vrefresh: vrefresh rate.
- * @interlaced	:whether the interlace is supported
+ * @interlaced: whether to compute an interlaced mode
- * @margins	:whether the margin is supported
- *
- * LOCKING.
- * none.
+ * @margins: desired margin (borders) size
+ *
  * return the modeline based on GTF algorithm
+ *
  * This function is to create the modeline based on the GTF algorithm.
  * Standard GTF parameters:
  * M = 600
  * C = 40
  * K = 128
  * J = 20
+ *
+ * Returns:
+ * The modeline based on the GTF algorithm stored in a drm_display_mode object.
+ * The display mode object is allocated with drm_mode_create(). Returns NULL
+ * when no mode could be allocated.
  */
 struct drm_display_mode *
 drm_gtf_mode(struct drm_device *dev, int hdisplay, int vdisplay, int vrefresh,
-	     bool lace, int margins)
+	     bool interlaced, int margins)
+{
-	return drm_gtf_mode_complex(dev, hdisplay, vdisplay, vrefresh, lace,
+	return drm_gtf_mode_complex(dev, hdisplay, vdisplay, vrefresh,
+				    interlaced, margins,
-				    margins, 600, 40 * 2, 128, 20 * 2);
+, 40 * 2, 128, 20 * 2);
+}
 EXPORT_SYMBOL(drm_gtf_mode);
+#ifdef CONFIG_VIDEOMODE_HELPERS
+/**
+ * drm_display_mode_from_videomode - fill in @dmode using @vm,
+ * @vm: videomode structure to use as source
+ * @dmode: drm_display_mode structure to use as destination
+ *
+ * Fills out @dmode using the display mode specified in @vm.
-#ifdef CONFIG_VIDEOMODE_HELPERS
+ */
-int drm_display_mode_from_videomode(const struct videomode *vm,
+void drm_display_mode_from_videomode(const struct videomode *vm,
 				    struct drm_display_mode *dmode)
+{
 	dmode->hdisplay = vm->hactive;
 	dmode->hsync_start = dmode->hdisplay + vm->hfront_porch;
 	if (vm->flags & DISPLAY_FLAGS_DOUBLESCAN)
 		dmode->flags |= DRM_MODE_FLAG_DBLSCAN;
 	if (vm->flags & DISPLAY_FLAGS_DOUBLECLK)
 		dmode->flags |= DRM_MODE_FLAG_DBLCLK;
 	drm_mode_set_name(dmode);
-	return 0;
+}
 EXPORT_SYMBOL_GPL(drm_display_mode_from_videomode);
 #ifdef CONFIG_OF
  * @index: index into the list of display timings in devicetree
+ *
  * This function is expensive and should only be used, if only one mode is to be
  * read from DT. To get multiple modes start with of_get_display_timings and
  * work with that instead.
+ *
+ * Returns:
+ * 0 on success, a negative errno code when no of videomode node was found.
  */
 int of_get_drm_display_mode(struct device_node *np,
 			    struct drm_display_mode *dmode, int index)
+{
 	struct videomode vm;
 /**
  * drm_mode_set_name - set the name on a mode
  * @mode: name will be set in this mode
- *
- * LOCKING:
- * None.
  *
+ * Set the name of @mode to a standard format which is x
- * Set the name of @mode to a standard format.
+ * with an optional 'i' suffix for interlaced modes.
  */
 void drm_mode_set_name(struct drm_display_mode *mode)
+{
 		 mode->hdisplay, mode->vdisplay,
 		 interlaced ? "i" : "");
+}
 EXPORT_SYMBOL(drm_mode_set_name);
-/**
- * drm_mode_width - get the width of a mode
- * @mode: mode
- *
- * LOCKING:
- * None.
- *
- * Return @mode's width (hdisplay) value.
- *
- * FIXME: is this needed?
- *
- * RETURNS:
- * @mode->hdisplay
- */
-int drm_mode_width(const struct drm_display_mode *mode)
-{
-	return mode->hdisplay;
-}
-EXPORT_SYMBOL(drm_mode_width);
-/**
- * drm_mode_height - get the height of a mode
- * @mode: mode
- *
- * LOCKING:
- * None.
- *
- * Return @mode's height (vdisplay) value.
- *
- * FIXME: is this needed?
- *
- * RETURNS:
- * @mode->vdisplay
- */
-int drm_mode_height(const struct drm_display_mode *mode)
-{
-	return mode->vdisplay;
-}
-EXPORT_SYMBOL(drm_mode_height);
 /** drm_mode_hsync - get the hsync of a mode
  * @mode: mode
  *
- * LOCKING:
- * None.
- *
+ * Returns:
+ * @modes's hsync rate in kHz, rounded to the nearest integer. Calculates the
- * Return @modes's hsync rate in kHz, rounded to the nearest int.
+ * value first if it is not yet set.
  */
 int drm_mode_hsync(const struct drm_display_mode *mode)
+{
 /**
  * drm_mode_vrefresh - get the vrefresh of a mode
  * @mode: mode
- *
- * LOCKING:
- * None.
- *
- * Return @mode's vrefresh rate in Hz or calculate it if necessary.
- *
- * FIXME: why is this needed?  shouldn't vrefresh be set already?
  *
- * RETURNS:
+ * Returns:
- * Vertical refresh rate. It will be the result of actual value plus 0.5.
- * If it is 70.288, it will return 70Hz.
+ * @modes's vrefresh rate in Hz, rounded to the nearest integer. Calculates the
- * If it is 59.6, it will return 60Hz.
+ * value first if it is not yet set.
  */
 int drm_mode_vrefresh(const struct drm_display_mode *mode)
+{
 	int refresh = 0;
 	return refresh;
+}
 EXPORT_SYMBOL(drm_mode_vrefresh);
 /**
- * drm_mode_set_crtcinfo - set CRTC modesetting parameters
+ * drm_mode_set_crtcinfo - set CRTC modesetting timing parameters
  * @p: mode
  * @adjust_flags: a combination of adjustment flags
- *
- * LOCKING:
- * None.
  *
- * Setup the CRTC modesetting parameters for @p, adjusting if necessary.
+ * Setup the CRTC modesetting timing parameters for @p, adjusting if necessary.
+ *
  * - The CRTC_INTERLACE_HALVE_V flag can be used to halve vertical timings of
  *   interlaced modes.
  * - The CRTC_STEREO_DOUBLE flag can be used to compute the timings for
 	p->crtc_hblank_start = min(p->crtc_hsync_start, p->crtc_hdisplay);
 	p->crtc_hblank_end = max(p->crtc_hsync_end, p->crtc_htotal);
+}
 EXPORT_SYMBOL(drm_mode_set_crtcinfo);
 /**
  * drm_mode_copy - copy the mode
  * @dst: mode to overwrite
  * @src: mode to copy
- *
- * LOCKING:
- * None.
+ *
  * Copy an existing mode into another mode, preserving the object id and
  * list head of the destination mode.
  */
 void drm_mode_copy(struct drm_display_mode *dst, const struct drm_display_mode *src)
+}
 EXPORT_SYMBOL(drm_mode_copy);
 /**
+ * drm_mode_duplicate - allocate and duplicate an existing mode
- * drm_mode_duplicate - allocate and duplicate an existing mode
+ * @dev: drm_device to allocate the duplicated mode for
- * @m: mode to duplicate
- *
- * LOCKING:
- * None.
+ * @mode: mode to duplicate
+ *
  * Just allocate a new mode, copy the existing mode into it, and return
+ * a pointer to it.  Used to create new instances of established modes.
+ *
+ * Returns:
- * a pointer to it.  Used to create new instances of established modes.
+ * Pointer to duplicated mode on success, NULL on error.
  */
 struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
 					    const struct drm_display_mode *mode)
+{
 /**
  * drm_mode_equal - test modes for equality
  * @mode1: first mode
  * @mode2: second mode
+ *
- * LOCKING:
- * None.
- *
  * Check to see if @mode1 and @mode2 are equivalent.
+ *
- * RETURNS:
+ * Returns:
  * True if the modes are equal, false otherwise.
  */
 bool drm_mode_equal(const struct drm_display_mode *mode1, const struct drm_display_mode *mode2)
+{
 	/* do clock check convert to PICOS so fb modes get matched
 /**
  * drm_mode_equal_no_clocks_no_stereo - test modes for equality
  * @mode1: first mode
  * @mode2: second mode
+ *
- * LOCKING:
- * None.
- *
  * Check to see if @mode1 and @mode2 are equivalent, but
  * don't check the pixel clocks nor the stereo layout.
+ *
- * RETURNS:
+ * Returns:
  * True if the modes are equal, false otherwise.
  */
 bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1,
 					const struct drm_display_mode *mode2)
+{
  * drm_mode_validate_size - make sure modes adhere to size constraints
  * @dev: DRM device
  * @mode_list: list of modes to check
  * @maxX: maximum width
  * @maxY: maximum height
- * @maxPitch: max pitch
+ *
- * LOCKING:
- * Caller must hold a lock protecting @mode_list.
+ * This function is a helper which can be used to validate modes against size
- *
- * The DRM device (@dev) has size and pitch limits.  Here we validate the
+ * limitations of the DRM device/connector. If a mode is too big its status
- * modes we probed for @dev against those limits and set their status as
+ * memeber is updated with the appropriate validation failure code. The list
- * necessary.
+ * itself is not changed.
  */
 void drm_mode_validate_size(struct drm_device *dev,
 			    struct list_head *mode_list,
-			    int maxX, int maxY, int maxPitch)
+			    int maxX, int maxY)
+{
 	struct drm_display_mode *mode;
-	list_for_each_entry(mode, mode_list, head) {
-		if (maxPitch > 0 && mode->hdisplay > maxPitch)
-			mode->status = MODE_BAD_WIDTH;
 	list_for_each_entry(mode, mode_list, head) {
 		if (maxX > 0 && mode->hdisplay > maxX)
 			mode->status = MODE_VIRTUAL_X;
  * drm_mode_prune_invalid - remove invalid modes from mode list
  * @dev: DRM device
  * @mode_list: list of modes to check
  * @verbose: be verbose about it
+ *
- * LOCKING:
- * Caller must hold a lock protecting @mode_list.
+ * This helper function can be used to prune a display mode list after
- *
- * Once mode list generation is complete, a caller can use this routine to
+ * validation has been completed. All modes who's status is not MODE_OK will be
- * remove invalid modes from a mode list.  If any of the modes have a
+ * removed from the list, and if @verbose the status code and mode name is also
- * status other than %MODE_OK, they are removed from @mode_list and freed.
+ * printed to dmesg.
  */
 void drm_mode_prune_invalid(struct drm_device *dev,
 			    struct list_head *mode_list, bool verbose)
+{
 	struct drm_display_mode *mode, *t;
  * drm_mode_compare - compare modes for favorability
  * @priv: unused
  * @lh_a: list_head for first mode
  * @lh_b: list_head for second mode
+ *
- * LOCKING:
- * None.
- *
  * Compare two modes, given by @lh_a and @lh_b, returning a value indicating
  * which is better.
+ *
- * RETURNS:
+ * Returns:
  * Negative if @lh_a is better than @lh_b, zero if they're equivalent, or
  * positive if @lh_b is better than @lh_a.
  */
 static int drm_mode_compare(void *priv, struct list_head *lh_a, struct list_head *lh_b)
+{
 	return diff;
+}
 /**
  * drm_mode_sort - sort mode list
- * @mode_list: list to sort
- *
- * LOCKING:
- * Caller must hold a lock protecting @mode_list.
+ * @mode_list: list of drm_display_mode structures to sort
  *
- * Sort @mode_list by favorability, putting good modes first.
+ * Sort @mode_list by favorability, moving good modes to the head of the list.
  */
 void drm_mode_sort(struct list_head *mode_list)
+{
 	list_sort(NULL, mode_list, drm_mode_compare);
+}
 EXPORT_SYMBOL(drm_mode_sort);
 /**
- * drm_mode_connector_list_update - update the mode list for the connector
- * @connector: the connector to update
- *
+ * drm_mode_connector_list_update - update the mode list for the connector
- * LOCKING:
+ * @connector: the connector to update
- * Caller must hold a lock protecting @mode_list.
+ * @merge_type_bits: whether to merge or overright type bits.
+ *
  * This moves the modes from the @connector probed_modes list
+ * to the actual mode list. It compares the probed mode against the current
+ * list and only adds different/new modes.
- * to the actual mode list. It compares the probed mode against the current
+ *
- * list and only adds different modes. All modes unverified after this point
+ * This is just a helper functions doesn't validate any modes itself and also
- * will be removed by the prune invalid modes.
+ * doesn't prune any invalid modes. Callers need to do that themselves.
+ */
- */
+void drm_mode_connector_list_update(struct drm_connector *connector,
-void drm_mode_connector_list_update(struct drm_connector *connector)
+				    bool merge_type_bits)
+{
 	struct drm_display_mode *mode;
+	struct drm_display_mode *pmode, *pt;
+	int found_it;
 	struct drm_display_mode *pmode, *pt;
-	int found_it;
+	WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex));
 	list_for_each_entry_safe(pmode, pt, &connector->probed_modes,
 				 head) {
 		found_it = 0;
 		/* go through current modes checking for the new probed mode */
 		list_for_each_entry(mode, &connector->modes, head) {
 			if (drm_mode_equal(pmode, mode)) {
 				found_it = 1;
+				/* if equal delete the probed mode */
-				/* if equal delete the probed mode */
+				mode->status = pmode->status;
+				/* Merge type bits together */
+				if (merge_type_bits)
-				mode->status = pmode->status;
+				mode->type |= pmode->type;
-				/* Merge type bits together */
+				else
-				mode->type |= pmode->type;
+					mode->type = pmode->type;
 				list_del(&pmode->head);
 				drm_mode_destroy(connector->dev, pmode);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_modes.c – Rev 4560 → 5060