5ecc0cfd6f
Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648, CVE-2020-8649 and CVE-2020-8647. Removed upstreamed: generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch ipq806x: 701-stmmac-fix-notifier-registration.patch lantiq: 002-pinctrl-falcon-fix-syntax-error.patch octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617 Build tested: sunxi/a53, imx6, x86/64, ipq40xx Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2] Signed-off-by: Petr Štetiar <ynezz@true.cz>
49 lines
1.6 KiB
Diff
49 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;
|