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

Commit d6e6e14f authored by LABBE Corentin's avatar LABBE Corentin Committed by Daniel Vetter
Browse files

drm: modes: Revert cc344980 "replace simple_strtoul by kstrtouint" 



My latest commit introduce some case where a valid mode, could be
rejected.
simple_strtox functions stop at first non-digit character, but kstrtox
not.
So args like "video=HDMI-A-1:720x480-16@60" will be reject when checking
16@.

Discussions about this change comes to the conclusion that the best
solution is to revert my commit cc344980.

Signed-off-by: default avatarLABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449838739-29969-1-git-send-email-clabbe.montjoie@gmail.com
parent 5dec293b

drivers/gpu/drm/drm_modes.c

+5 −11
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, 
	unsigned int xres = 0, yres = 0, bpp = 32, refresh = 0;

	bool yres_specified = false, cvt = false, rb = false;

	bool interlace = false, margins = false, was_digit = false;

	int i, err;

	int i;

	enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;



#ifdef CONFIG_FB
@@ -1282,9 +1282,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, 
		case '@':

			if (!refresh_specified && !bpp_specified &&

			    !yres_specified && !cvt && !rb && was_digit) {

				err = kstrtouint(&name[i + 1], 10, &refresh);

				if (err)

					return false;

				refresh = simple_strtol(&name[i+1], NULL, 10);

				refresh_specified = true;

				was_digit = false;

			} else
@@ -1293,9 +1291,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, 
		case '-':

			if (!bpp_specified && !yres_specified && !cvt &&

			    !rb && was_digit) {

				err = kstrtouint(&name[i + 1], 10, &bpp);

				if (err)

					return false;

				bpp = simple_strtol(&name[i+1], NULL, 10);

				bpp_specified = true;

				was_digit = false;

			} else
@@ -1303,9 +1299,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, 
			break;

		case 'x':

			if (!yres_specified && was_digit) {

				err = kstrtouint(&name[i + 1], 10, &yres);

				if (err)

					return false;

				yres = simple_strtol(&name[i+1], NULL, 10);

				yres_specified = true;

				was_digit = false;

			} else