You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From d3c76025a7de614fade5ffcaa8c1d88d8d64213e Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 18 Nov 2019 16:51:27 +0100
|
|
Subject: [PATCH] drm/modes: parse_cmdline: Add freestanding argument
|
|
to drm_mode_parse_cmdline_options()
|
|
|
|
Commit 99e2716e053734b70434502867be24d20a3e2d84 upstream.
|
|
|
|
Add a freestanding function argument to drm_mode_parse_cmdline_options()
|
|
similar to how drm_mode_parse_cmdline_extra() already has this.
|
|
|
|
This is a preparation patch for allowing parsing of stand-alone options
|
|
without a mode before them, e.g.: video=HDMI-1:margin_right=14,...
|
|
|
|
Acked-by: Maxime Ripard <mripard@kernel.org>
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdegoede@redhat.com
|
|
---
|
|
drivers/gpu/drm/drm_modes.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/drm_modes.c
|
|
+++ b/drivers/gpu/drm/drm_modes.c
|
|
@@ -1592,6 +1592,7 @@ static int drm_mode_parse_cmdline_int(co
|
|
}
|
|
|
|
static int drm_mode_parse_cmdline_options(const char *str,
|
|
+ bool freestanding,
|
|
const struct drm_connector *connector,
|
|
struct drm_cmdline_mode *mode)
|
|
{
|
|
@@ -1670,6 +1671,9 @@ static int drm_mode_parse_cmdline_option
|
|
if (!is_power_of_2(rotation & DRM_MODE_ROTATE_MASK))
|
|
return -EINVAL;
|
|
|
|
+ if (rotation && freestanding)
|
|
+ return -EINVAL;
|
|
+
|
|
mode->rotation_reflection = rotation;
|
|
|
|
return 0;
|
|
@@ -1862,6 +1866,7 @@ bool drm_mode_parse_command_line_for_con
|
|
|
|
if (options_ptr) {
|
|
ret = drm_mode_parse_cmdline_options(options_ptr + 1,
|
|
+ false,
|
|
connector, mode);
|
|
if (ret)
|
|
return false;
|