|
@@ -1023,17 +1023,7 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1,
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo);
|
|
EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo);
|
|
|
|
|
|
-/**
|
|
|
|
- * drm_mode_validate_basic - make sure the mode is somewhat sane
|
|
|
|
- * @mode: mode to check
|
|
|
|
- *
|
|
|
|
- * Check that the mode timings are at least somewhat reasonable.
|
|
|
|
- * Any hardware specific limits are left up for each driver to check.
|
|
|
|
- *
|
|
|
|
- * Returns:
|
|
|
|
- * The mode status
|
|
|
|
- */
|
|
|
|
-enum drm_mode_status
|
|
|
|
|
|
+static enum drm_mode_status
|
|
drm_mode_validate_basic(const struct drm_display_mode *mode)
|
|
drm_mode_validate_basic(const struct drm_display_mode *mode)
|
|
{
|
|
{
|
|
if (mode->type & ~DRM_MODE_TYPE_ALL)
|
|
if (mode->type & ~DRM_MODE_TYPE_ALL)
|
|
@@ -1062,7 +1052,35 @@ drm_mode_validate_basic(const struct drm_display_mode *mode)
|
|
|
|
|
|
return MODE_OK;
|
|
return MODE_OK;
|
|
}
|
|
}
|
|
-EXPORT_SYMBOL(drm_mode_validate_basic);
|
|
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * drm_mode_validate_driver - make sure the mode is somewhat sane
|
|
|
|
+ * @dev: drm device
|
|
|
|
+ * @mode: mode to check
|
|
|
|
+ *
|
|
|
|
+ * First do basic validation on the mode, and then allow the driver
|
|
|
|
+ * to check for device/driver specific limitations via the optional
|
|
|
|
+ * &drm_mode_config_helper_funcs.mode_valid hook.
|
|
|
|
+ *
|
|
|
|
+ * Returns:
|
|
|
|
+ * The mode status
|
|
|
|
+ */
|
|
|
|
+enum drm_mode_status
|
|
|
|
+drm_mode_validate_driver(struct drm_device *dev,
|
|
|
|
+ const struct drm_display_mode *mode)
|
|
|
|
+{
|
|
|
|
+ enum drm_mode_status status;
|
|
|
|
+
|
|
|
|
+ status = drm_mode_validate_basic(mode);
|
|
|
|
+ if (status != MODE_OK)
|
|
|
|
+ return status;
|
|
|
|
+
|
|
|
|
+ if (dev->mode_config.funcs->mode_valid)
|
|
|
|
+ return dev->mode_config.funcs->mode_valid(dev, mode);
|
|
|
|
+ else
|
|
|
|
+ return MODE_OK;
|
|
|
|
+}
|
|
|
|
+EXPORT_SYMBOL(drm_mode_validate_driver);
|
|
|
|
|
|
/**
|
|
/**
|
|
* drm_mode_validate_size - make sure modes adhere to size constraints
|
|
* drm_mode_validate_size - make sure modes adhere to size constraints
|
|
@@ -1564,6 +1582,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out,
|
|
|
|
|
|
/**
|
|
/**
|
|
* drm_crtc_convert_umode - convert a modeinfo into a drm_display_mode
|
|
* drm_crtc_convert_umode - convert a modeinfo into a drm_display_mode
|
|
|
|
+ * @dev: drm device
|
|
* @out: drm_display_mode to return to the user
|
|
* @out: drm_display_mode to return to the user
|
|
* @in: drm_mode_modeinfo to use
|
|
* @in: drm_mode_modeinfo to use
|
|
*
|
|
*
|
|
@@ -1573,7 +1592,8 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out,
|
|
* Returns:
|
|
* Returns:
|
|
* Zero on success, negative errno on failure.
|
|
* Zero on success, negative errno on failure.
|
|
*/
|
|
*/
|
|
-int drm_mode_convert_umode(struct drm_display_mode *out,
|
|
|
|
|
|
+int drm_mode_convert_umode(struct drm_device *dev,
|
|
|
|
+ struct drm_display_mode *out,
|
|
const struct drm_mode_modeinfo *in)
|
|
const struct drm_mode_modeinfo *in)
|
|
{
|
|
{
|
|
int ret = -EINVAL;
|
|
int ret = -EINVAL;
|
|
@@ -1600,7 +1620,7 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
|
|
strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
|
|
strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
|
|
out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
|
|
out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
|
|
|
|
|
|
- out->status = drm_mode_validate_basic(out);
|
|
|
|
|
|
+ out->status = drm_mode_validate_driver(dev, out);
|
|
if (out->status != MODE_OK)
|
|
if (out->status != MODE_OK)
|
|
goto out;
|
|
goto out;
|
|
|
|
|