Commit cfb0881b authored by Hans de Goede's avatar Hans de Goede
Browse files

drm/modes: parse_cmdline: Accept extras directly after mode combined with options 



Before this commit it was impossible to combine an extra mode argument
specified directly after the resolution with an option, e.g.
video=HDMI-1:720x480e,rotate=180 would not work, either the "e" to force
enable would need to be dropped or the ",rotate=180", otherwise the
mode_option would not be accepted.

This commit fixes this by setting parse_extras to true in this case, so
that drm_mode_parse_cmdline_res_mode() parses the extra arguments directly
after the resolution.

Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdegoede@redhat.com
parent c2ed3e94

drivers/gpu/drm/drm_modes.c

+1 −0
Original line number Diff line number Diff line
@@ -1794,6 +1794,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, 
		mode_end = refresh_off;

	} else if (options_ptr) {

		mode_end = options_off;

		parse_extras = true;

	} else {

		mode_end = strlen(name);

		parse_extras = true;

drivers/gpu/drm/selftests/drm_cmdline_selftests.h

+1 −0
Original line number Diff line number Diff line
@@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_margin_options) 
cmdline_test(drm_cmdline_test_multiple_options)

cmdline_test(drm_cmdline_test_invalid_option)

cmdline_test(drm_cmdline_test_bpp_extra_and_option)

cmdline_test(drm_cmdline_test_extra_and_option)

drivers/gpu/drm/selftests/test-drm_cmdline_parser.c

+24 −0
Original line number Diff line number Diff line
@@ -1018,6 +1018,30 @@ static int drm_cmdline_test_bpp_extra_and_option(void *ignored) 
	return 0;

}



static int drm_cmdline_test_extra_and_option(void *ignored)

{

	struct drm_cmdline_mode mode = { };



	FAIL_ON(!drm_mode_parse_command_line_for_connector("720x480e,rotate=180",

							   &no_connector,

							   &mode));

	FAIL_ON(!mode.specified);

	FAIL_ON(mode.xres != 720);

	FAIL_ON(mode.yres != 480);

	FAIL_ON(mode.rotation_reflection != DRM_MODE_ROTATE_180);



	FAIL_ON(mode.refresh_specified);

	FAIL_ON(mode.bpp_specified);



	FAIL_ON(mode.rb);

	FAIL_ON(mode.cvt);

	FAIL_ON(mode.interlace);

	FAIL_ON(mode.margins);

	FAIL_ON(mode.force != DRM_FORCE_ON);



	return 0;

}



#include "drm_selftest.c"



static int __init test_drm_cmdline_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE