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>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 339666068713986cfe1456175dd8a7514f6ed2ab Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 18 Nov 2019 16:51:31 +0100
|
|
Subject: [PATCH] drm/modes: parse_cmdline: Remove some unnecessary
|
|
code (v2)
|
|
|
|
Commit 5b926617cdef41ce0696e09834991194b1759e28 upstream.
|
|
|
|
fb_get_options() will return fb_mode_option if no video=<connector-name>
|
|
argument is present on the kernel commandline, so there is no need to also
|
|
do this in drm_mode_parse_command_line_for_connector() as our only caller
|
|
uses fb_get_options() to get the mode_option argument.
|
|
|
|
Changes in v2:
|
|
-Split out the changes dealing with the initialization of the mode struct
|
|
into a separate patch
|
|
|
|
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-10-hdegoede@redhat.com
|
|
---
|
|
drivers/gpu/drm/drm_modes.c | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_modes.c
|
|
+++ b/drivers/gpu/drm/drm_modes.c
|
|
@@ -1754,11 +1754,6 @@ bool drm_mode_parse_command_line_for_con
|
|
|
|
mode->panel_orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
|
|
|
|
-#ifdef CONFIG_FB
|
|
- if (!mode_option)
|
|
- mode_option = fb_mode_option;
|
|
-#endif
|
|
-
|
|
if (!mode_option) {
|
|
mode->specified = false;
|
|
return false;
|