diff options
Diffstat (limited to 'target/linux/bcm27xx')
21 files changed, 45 insertions, 89 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch b/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch index cca2191d91..7419136f8a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -724,7 +724,7 @@ static int spidev_probe(struct spi_devic +@@ -729,7 +729,7 @@ static int spidev_probe(struct spi_devic * compatible string, it is a Linux implementation thing * rather than a description of the hardware. */ diff --git a/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch index 970c78f4df..0823c01c53 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch @@ -1040,7 +1040,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5302,7 +5302,7 @@ static void port_event(struct usb_hub *h +@@ -5306,7 +5306,7 @@ static void port_event(struct usb_hub *h port_dev->over_current_count++; port_over_current_notify(port_dev); diff --git a/target/linux/bcm27xx/patches-5.4/950-0056-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/bcm27xx/patches-5.4/950-0056-Improve-__copy_to_user-and-__copy_from_user-performa.patch index 9b0257d3a4..d7f51722fd 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0056-Improve-__copy_to_user-and-__copy_from_user-performa.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0056-Improve-__copy_to_user-and-__copy_from_user-performa.patch @@ -276,7 +276,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ENDPROC(arm_copy_from_user) +ENDPROC(__copy_from_user_std) - .pushsection .fixup,"ax" + .pushsection .text.fixup,"ax" .align 0 --- /dev/null +++ b/arch/arm/lib/exports_rpi.c diff --git a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch index 96ab11f8ab..30eefd3e21 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c -@@ -5707,6 +5707,8 @@ int __init cgroup_init_early(void) +@@ -5720,6 +5720,8 @@ int __init cgroup_init_early(void) } static u16 cgroup_disable_mask __initdata; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /** * cgroup_init - cgroup initialization -@@ -5746,6 +5748,12 @@ int __init cgroup_init(void) +@@ -5759,6 +5761,12 @@ int __init cgroup_init(void) mutex_unlock(&cgroup_mutex); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> for_each_subsys(ss, ssid) { if (ss->early_init) { struct cgroup_subsys_state *css = -@@ -6165,6 +6173,28 @@ static int __init cgroup_disable(char *s +@@ -6178,6 +6186,28 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/bcm27xx/patches-5.4/950-0215-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-5.4/950-0215-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index 1728ed70d3..ee1e3940b3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0215-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0215-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -243,6 +243,10 @@ static void xhci_pci_quirks(struct devic +@@ -244,6 +244,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; diff --git a/target/linux/bcm27xx/patches-5.4/950-0268-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-5.4/950-0268-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index 50b9a9b4b4..afddaa9462 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0268-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0268-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -244,8 +244,10 @@ static void xhci_pci_quirks(struct devic +@@ -245,8 +245,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_VIA && diff --git a/target/linux/bcm27xx/patches-5.4/950-0284-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.4/950-0284-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 1843ebdce0..203e8638a2 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0284-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0284-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1224,6 +1227,9 @@ +@@ -1226,6 +1229,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, -@@ -175,6 +176,7 @@ static const struct hid_device_id hid_qu +@@ -176,6 +177,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, diff --git a/target/linux/bcm27xx/patches-5.4/950-0317-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch b/target/linux/bcm27xx/patches-5.4/950-0317-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch index d02902a9b3..c7b3e7e09e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0317-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0317-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch @@ -31,6 +31,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> +%.dtbo: prepare3 scripts_dtc + $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ + - PHONY += dtbs dtbs_install dt_binding_check + PHONY += dtbs dtbs_install dtbs_check dtbs dtbs_check: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) diff --git a/target/linux/bcm27xx/patches-5.4/950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch b/target/linux/bcm27xx/patches-5.4/950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch deleted file mode 100644 index ae9b9f44fa..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9a536b0cb8f83bd979fe274ef0197ece12a3ed09 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl <hias@horus.com> -Date: Thu, 20 Feb 2020 21:29:56 +0100 -Subject: [PATCH] ASoC: pcm512x: Fix unbalanced regulator enable call - in probe error path - -commit ac0a68997935c4acb92eaae5ad8982e0bb432d56 upstream. - -When we get a clock error during probe we have to call -regulator_bulk_disable before bailing out, otherwise we trigger -a warning in regulator_put. - -Fix this by using "goto err" like in the error cases above. - -Fixes: 5a3af1293194d ("ASoC: pcm512x: Add PCM512x driver") -Signed-off-by: Matthias Reichl <hias@horus.com> -Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> -Link: https://lore.kernel.org/r/20200220202956.29233-1-hias@horus.com -Signed-off-by: Mark Brown <broonie@kernel.org> ---- - sound/soc/codecs/pcm512x.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/sound/soc/codecs/pcm512x.c -+++ b/sound/soc/codecs/pcm512x.c -@@ -1564,13 +1564,15 @@ int pcm512x_probe(struct device *dev, st - } - - pcm512x->sclk = devm_clk_get(dev, NULL); -- if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER) -- return -EPROBE_DEFER; -+ if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER) { -+ ret = -EPROBE_DEFER; -+ goto err; -+ } - if (!IS_ERR(pcm512x->sclk)) { - ret = clk_prepare_enable(pcm512x->sclk); - if (ret != 0) { - dev_err(dev, "Failed to enable SCLK: %d\n", ret); -- return ret; -+ goto err; - } - } - diff --git a/target/linux/bcm27xx/patches-5.4/950-0466-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch b/target/linux/bcm27xx/patches-5.4/950-0466-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch index e9b8a76831..5795d47464 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0466-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0466-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch @@ -23,4 +23,4 @@ Signed-off-by: Nataliya Korovkina <malus.brandywine@gmail.com> +%.dtbo: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ - PHONY += dtbs dtbs_install dt_binding_check + PHONY += dtbs dtbs_install dtbs_check diff --git a/target/linux/bcm27xx/patches-5.4/950-0480-drm-modes-parse_cmdline-Fix-possible-reference-past-.patch b/target/linux/bcm27xx/patches-5.4/950-0480-drm-modes-parse_cmdline-Fix-possible-reference-past-.patch index 1617a45d52..9b514c3a25 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0480-drm-modes-parse_cmdline-Fix-possible-reference-past-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0480-drm-modes-parse_cmdline-Fix-possible-reference-past-.patch @@ -138,4 +138,4 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-1-hdego + sep = delim; } - mode->rotation_reflection = rotation; + if (!(rotation & DRM_MODE_ROTATE_MASK)) diff --git a/target/linux/bcm27xx/patches-5.4/950-0481-drm-modes-parse_cmdline-Make-various-char-pointers-c.patch b/target/linux/bcm27xx/patches-5.4/950-0481-drm-modes-parse_cmdline-Make-various-char-pointers-c.patch index ef8c161f52..6abe7beb32 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0481-drm-modes-parse_cmdline-Make-various-char-pointers-c.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0481-drm-modes-parse_cmdline-Make-various-char-pointers-c.patch @@ -37,7 +37,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-2-hdego option = sep + 1; delim = strchr(option, '='); -@@ -1718,8 +1718,8 @@ bool drm_mode_parse_command_line_for_con +@@ -1725,8 +1725,8 @@ bool drm_mode_parse_command_line_for_con bool named_mode = false, parse_extras = false; unsigned int bpp_off = 0, refresh_off = 0, options_off = 0; unsigned int mode_end = 0; diff --git a/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch b/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch index 1128ac0c36..1d356eb6ab 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch @@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1721,7 +1721,7 @@ bool drm_mode_parse_command_line_for_con +@@ -1728,7 +1728,7 @@ bool drm_mode_parse_command_line_for_con const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL; const char *options_ptr = NULL; char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL; @@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego #ifdef CONFIG_FB if (!mode_option) -@@ -1841,9 +1841,11 @@ bool drm_mode_parse_command_line_for_con +@@ -1848,9 +1848,11 @@ bool drm_mode_parse_command_line_for_con else if (refresh_ptr) extra_ptr = refresh_end_ptr; @@ -53,14 +53,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego connector, mode); --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -@@ -60,3 +60,4 @@ cmdline_test(drm_cmdline_test_vmirror) +@@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_vmirror) 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) --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -@@ -992,6 +992,32 @@ static int drm_cmdline_test_invalid_opti +@@ -1003,6 +1003,32 @@ static int drm_cmdline_test_invalid_opti return 0; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0483-drm-modes-parse_cmdline-Accept-extras-directly-after.patch b/target/linux/bcm27xx/patches-5.4/950-0483-drm-modes-parse_cmdline-Accept-extras-directly-after.patch index 79cfa56e84..8d9a92ec0d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0483-drm-modes-parse_cmdline-Accept-extras-directly-after.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0483-drm-modes-parse_cmdline-Accept-extras-directly-after.patch @@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdego --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1794,6 +1794,7 @@ bool drm_mode_parse_command_line_for_con +@@ -1801,6 +1801,7 @@ bool drm_mode_parse_command_line_for_con mode_end = refresh_off; } else if (options_ptr) { mode_end = options_off; @@ -37,14 +37,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdego parse_extras = true; --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -@@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_margin_opt +@@ -62,3 +62,4 @@ cmdline_test(drm_cmdline_test_margin_opt 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) --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -@@ -1018,6 +1018,30 @@ static int drm_cmdline_test_bpp_extra_an +@@ -1029,6 +1029,30 @@ static int drm_cmdline_test_bpp_extra_an return 0; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0484-drm-modes-parse_cmdline-Rework-drm_mode_parse_cmdlin.patch b/target/linux/bcm27xx/patches-5.4/950-0484-drm-modes-parse_cmdline-Rework-drm_mode_parse_cmdlin.patch index 0cf2939a06..1716ebd7be 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0484-drm-modes-parse_cmdline-Rework-drm_mode_parse_cmdlin.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0484-drm-modes-parse_cmdline-Rework-drm_mode_parse_cmdlin.patch @@ -61,9 +61,9 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-5-hdego + option = sep + 1; + } while (sep); - mode->rotation_reflection = rotation; - -@@ -1855,9 +1854,7 @@ bool drm_mode_parse_command_line_for_con + if (!(rotation & DRM_MODE_ROTATE_MASK)) + rotation |= DRM_MODE_ROTATE_0; +@@ -1862,9 +1861,7 @@ bool drm_mode_parse_command_line_for_con } if (options_ptr) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0485-drm-modes-parse_cmdline-Add-freestanding-argument-to.patch b/target/linux/bcm27xx/patches-5.4/950-0485-drm-modes-parse_cmdline-Add-freestanding-argument-to.patch index ac37b72f74..6ed952bd45 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0485-drm-modes-parse_cmdline-Add-freestanding-argument-to.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0485-drm-modes-parse_cmdline-Add-freestanding-argument-to.patch @@ -29,9 +29,9 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdego const struct drm_connector *connector, struct drm_cmdline_mode *mode) { -@@ -1663,6 +1664,9 @@ static int drm_mode_parse_cmdline_option - option = sep + 1; - } while (sep); +@@ -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; @@ -39,7 +39,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdego mode->rotation_reflection = rotation; return 0; -@@ -1855,6 +1859,7 @@ bool drm_mode_parse_command_line_for_con +@@ -1862,6 +1866,7 @@ bool drm_mode_parse_command_line_for_con if (options_ptr) { ret = drm_mode_parse_cmdline_options(options_ptr + 1, diff --git a/target/linux/bcm27xx/patches-5.4/950-0486-drm-modes-parse_cmdline-Set-bpp-refresh_specified-af.patch b/target/linux/bcm27xx/patches-5.4/950-0486-drm-modes-parse_cmdline-Set-bpp-refresh_specified-af.patch index 7f0c6299de..ac973e1d4e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0486-drm-modes-parse_cmdline-Set-bpp-refresh_specified-af.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0486-drm-modes-parse_cmdline-Set-bpp-refresh_specified-af.patch @@ -24,7 +24,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1771,10 +1771,8 @@ bool drm_mode_parse_command_line_for_con +@@ -1778,10 +1778,8 @@ bool drm_mode_parse_command_line_for_con /* Try to locate the bpp and refresh specifiers, if any */ bpp_ptr = strchr(name, '-'); @@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego refresh_ptr = strchr(name, '@'); if (refresh_ptr) { -@@ -1782,7 +1780,6 @@ bool drm_mode_parse_command_line_for_con +@@ -1789,7 +1787,6 @@ bool drm_mode_parse_command_line_for_con return false; refresh_off = refresh_ptr - name; @@ -44,7 +44,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego } /* Locate the start of named options */ -@@ -1825,6 +1822,8 @@ bool drm_mode_parse_command_line_for_con +@@ -1832,6 +1829,8 @@ bool drm_mode_parse_command_line_for_con ret = drm_mode_parse_cmdline_bpp(bpp_ptr, &bpp_end_ptr, mode); if (ret) return false; @@ -53,7 +53,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego } if (refresh_ptr) { -@@ -1832,6 +1831,8 @@ bool drm_mode_parse_command_line_for_con +@@ -1839,6 +1838,8 @@ bool drm_mode_parse_command_line_for_con &refresh_end_ptr, mode); if (ret) return false; diff --git a/target/linux/bcm27xx/patches-5.4/950-0487-drm-modes-parse_cmdline-Allow-specifying-stand-alone.patch b/target/linux/bcm27xx/patches-5.4/950-0487-drm-modes-parse_cmdline-Allow-specifying-stand-alone.patch index 301ad57f03..746f35f83b 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0487-drm-modes-parse_cmdline-Allow-specifying-stand-alone.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0487-drm-modes-parse_cmdline-Allow-specifying-stand-alone.patch @@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1677,17 +1677,6 @@ static const char * const drm_named_mode +@@ -1684,17 +1684,6 @@ static const char * const drm_named_mode "PAL", }; @@ -45,7 +45,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego /** * drm_mode_parse_command_line_for_connector - parse command line modeline for connector * @mode_option: optional per connector mode option -@@ -1718,7 +1707,7 @@ bool drm_mode_parse_command_line_for_con +@@ -1725,7 +1714,7 @@ bool drm_mode_parse_command_line_for_con struct drm_cmdline_mode *mode) { const char *name; @@ -54,7 +54,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego unsigned int bpp_off = 0, refresh_off = 0, options_off = 0; unsigned int mode_end = 0; const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL; -@@ -1738,49 +1727,14 @@ bool drm_mode_parse_command_line_for_con +@@ -1745,49 +1734,14 @@ bool drm_mode_parse_command_line_for_con name = mode_option; @@ -105,7 +105,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego /* Locate the start of named options */ options_ptr = strchr(name, ','); -@@ -1800,23 +1754,45 @@ bool drm_mode_parse_command_line_for_con +@@ -1807,23 +1761,45 @@ bool drm_mode_parse_command_line_for_con parse_extras = true; } @@ -160,7 +160,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego if (bpp_ptr) { ret = drm_mode_parse_cmdline_bpp(bpp_ptr, &bpp_end_ptr, mode); -@@ -1852,7 +1828,7 @@ bool drm_mode_parse_command_line_for_con +@@ -1859,7 +1835,7 @@ bool drm_mode_parse_command_line_for_con else len = strlen(extra_ptr); @@ -169,7 +169,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego connector, mode); if (ret) return false; -@@ -1860,7 +1836,7 @@ bool drm_mode_parse_command_line_for_con +@@ -1867,7 +1843,7 @@ bool drm_mode_parse_command_line_for_con if (options_ptr) { ret = drm_mode_parse_cmdline_options(options_ptr + 1, @@ -180,7 +180,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego return false; --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -@@ -62,3 +62,5 @@ cmdline_test(drm_cmdline_test_multiple_o +@@ -63,3 +63,5 @@ cmdline_test(drm_cmdline_test_multiple_o cmdline_test(drm_cmdline_test_invalid_option) cmdline_test(drm_cmdline_test_bpp_extra_and_option) cmdline_test(drm_cmdline_test_extra_and_option) @@ -188,7 +188,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego +cmdline_test(drm_cmdline_test_freestanding_force_e_and_options) --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -@@ -1042,6 +1042,56 @@ static int drm_cmdline_test_extra_and_op +@@ -1053,6 +1053,56 @@ static int drm_cmdline_test_extra_and_op return 0; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0488-drm-modes-parse_cmdline-Add-support-for-specifying-p.patch b/target/linux/bcm27xx/patches-5.4/950-0488-drm-modes-parse_cmdline-Add-support-for-specifying-p.patch index 29382003a8..cbda9ecc10 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0488-drm-modes-parse_cmdline-Add-support-for-specifying-p.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0488-drm-modes-parse_cmdline-Add-support-for-specifying-p.patch @@ -91,7 +91,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-9-hdego } else { return -EINVAL; } -@@ -1715,6 +1745,8 @@ bool drm_mode_parse_command_line_for_con +@@ -1722,6 +1752,8 @@ bool drm_mode_parse_command_line_for_con char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL; int i, len, ret; @@ -102,14 +102,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-9-hdego mode_option = fb_mode_option; --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h -@@ -64,3 +64,4 @@ cmdline_test(drm_cmdline_test_bpp_extra_ +@@ -65,3 +65,4 @@ cmdline_test(drm_cmdline_test_bpp_extra_ cmdline_test(drm_cmdline_test_extra_and_option) cmdline_test(drm_cmdline_test_freestanding_options) cmdline_test(drm_cmdline_test_freestanding_force_e_and_options) +cmdline_test(drm_cmdline_test_panel_orientation) --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c -@@ -1092,6 +1092,28 @@ static int drm_cmdline_test_freestanding +@@ -1103,6 +1103,28 @@ static int drm_cmdline_test_freestanding return 0; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0489-drm-modes-parse_cmdline-Remove-some-unnecessary-code.patch b/target/linux/bcm27xx/patches-5.4/950-0489-drm-modes-parse_cmdline-Remove-some-unnecessary-code.patch index ce80f19b74..fb4a7f1cda 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0489-drm-modes-parse_cmdline-Remove-some-unnecessary-code.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0489-drm-modes-parse_cmdline-Remove-some-unnecessary-code.patch @@ -24,7 +24,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-10-hdeg --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1747,11 +1747,6 @@ bool drm_mode_parse_command_line_for_con +@@ -1754,11 +1754,6 @@ bool drm_mode_parse_command_line_for_con mode->panel_orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN; diff --git a/target/linux/bcm27xx/patches-5.4/950-0490-drm-modes-parse_cmdline-Explicitly-memset-the-passed.patch b/target/linux/bcm27xx/patches-5.4/950-0490-drm-modes-parse_cmdline-Explicitly-memset-the-passed.patch index 6c17d894f7..372cd0d665 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0490-drm-modes-parse_cmdline-Explicitly-memset-the-passed.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0490-drm-modes-parse_cmdline-Explicitly-memset-the-passed.patch @@ -24,7 +24,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-11-hdeg --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c -@@ -1745,12 +1745,11 @@ bool drm_mode_parse_command_line_for_con +@@ -1752,12 +1752,11 @@ bool drm_mode_parse_command_line_for_con char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL; int i, len, ret; |