Commit 6ab0edf4 authored by Ville Syrjälä's avatar Ville Syrjälä

drm: Print bad user modes

Print out the modeline when we reject a bad user mode. Avoids having to
guess why it was rejected.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180611193403.16118-2-ville.syrjala@linux.intel.comReviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
parent b6f690ab
...@@ -392,10 +392,24 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state, ...@@ -392,10 +392,24 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state,
memset(&state->mode, 0, sizeof(state->mode)); memset(&state->mode, 0, sizeof(state->mode));
if (blob) { if (blob) {
if (blob->length != sizeof(struct drm_mode_modeinfo) || int ret;
drm_mode_convert_umode(state->crtc->dev, &state->mode,
blob->data)) if (blob->length != sizeof(struct drm_mode_modeinfo)) {
DRM_DEBUG_ATOMIC("[CRTC:%d:%s] bad mode blob length: %zu\n",
crtc->base.id, crtc->name,
blob->length);
return -EINVAL;
}
ret = drm_mode_convert_umode(crtc->dev,
&state->mode, blob->data);
if (ret) {
DRM_DEBUG_ATOMIC("[CRTC:%d:%s] invalid mode (ret=%d, status=%s):\n",
crtc->base.id, crtc->name,
ret, drm_get_mode_status_name(state->mode.status));
drm_mode_debug_printmodeline(&state->mode);
return -EINVAL; return -EINVAL;
}
state->mode_blob = drm_property_blob_get(blob); state->mode_blob = drm_property_blob_get(blob);
state->enable = true; state->enable = true;
......
...@@ -649,7 +649,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, ...@@ -649,7 +649,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
ret = drm_mode_convert_umode(dev, mode, &crtc_req->mode); ret = drm_mode_convert_umode(dev, mode, &crtc_req->mode);
if (ret) { if (ret) {
DRM_DEBUG_KMS("Invalid mode\n"); DRM_DEBUG_KMS("Invalid mode (ret=%d, status=%s)\n",
ret, drm_get_mode_status_name(mode->status));
drm_mode_debug_printmodeline(mode);
goto out; goto out;
} }
......
...@@ -56,6 +56,9 @@ int drm_mode_setcrtc(struct drm_device *dev, ...@@ -56,6 +56,9 @@ int drm_mode_setcrtc(struct drm_device *dev,
int drm_modeset_register_all(struct drm_device *dev); int drm_modeset_register_all(struct drm_device *dev);
void drm_modeset_unregister_all(struct drm_device *dev); void drm_modeset_unregister_all(struct drm_device *dev);
/* drm_modes.c */
const char *drm_get_mode_status_name(enum drm_mode_status status);
/* IOCTLs */ /* IOCTLs */
int drm_mode_getresources(struct drm_device *dev, int drm_mode_getresources(struct drm_device *dev,
void *data, struct drm_file *file_priv); void *data, struct drm_file *file_priv);
......
...@@ -1257,7 +1257,7 @@ static const char * const drm_mode_status_names[] = { ...@@ -1257,7 +1257,7 @@ static const char * const drm_mode_status_names[] = {
#undef MODE_STATUS #undef MODE_STATUS
static const char *drm_get_mode_status_name(enum drm_mode_status status) const char *drm_get_mode_status_name(enum drm_mode_status status)
{ {
int index = status + 3; int index = status + 3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment