kernel: bump 5.4 to 5.4.28

[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch

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 1128ac0c367621de6ad52ca26074ecf912462119..1d356eb6abcc506ebf91611c4c5f1417d19c8c88 100644 (file)
--- 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;
  }