Commit 7dec9a96 authored by Daniel Stone's avatar Daniel Stone Committed by Daniel Vetter
Browse files

drm/mode: Validate modes inside drm_crtc_convert_umode 



The only user of convert_umode was also performing mode validation, so
do that in the same place.

Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
Tested-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9f658b7b

drivers/gpu/drm/drm_crtc.c

+15 −10
Original line number Diff line number Diff line
@@ -1785,11 +1785,15 @@ static void drm_crtc_convert_to_umode(struct drm_mode_modeinfo *out, 
static int drm_crtc_convert_umode(struct drm_display_mode *out,

				  const struct drm_mode_modeinfo *in)

{

	if (in->clock > INT_MAX || in->vrefresh > INT_MAX)

		return -ERANGE;

	int ret = -EINVAL;



	if (in->clock > INT_MAX || in->vrefresh > INT_MAX) {

		ret = -ERANGE;

		goto out;

	}



	if ((in->flags & DRM_MODE_FLAG_3D_MASK) > DRM_MODE_FLAG_3D_MAX)

		return -EINVAL;

		goto out;



	out->clock = in->clock;

	out->hdisplay = in->hdisplay;
@@ -1808,7 +1812,14 @@ static int drm_crtc_convert_umode(struct drm_display_mode *out, 
	strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);

	out->name[DRM_DISPLAY_MODE_LEN-1] = 0;



	return 0;

	out->status = drm_mode_validate_basic(out);

	if (out->status != MODE_OK)

		goto out;



	ret = 0;



out:

	return ret;

}



/**
@@ -2821,12 +2832,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
			goto out;

		}



		mode->status = drm_mode_validate_basic(mode);

		if (mode->status != MODE_OK) {

			ret = -EINVAL;

			goto out;

		}



		drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);



		/*