| From 9d576fff2b9bdd5164b5b2814486e11dcbce01c6 Mon Sep 17 00:00:00 2001 |
| From: Peter Rosin <peda@axentia.se> |
| Date: Tue, 27 Aug 2019 11:09:16 +0000 |
| Subject: [PATCH] fbdev: fix numbering of fbcon options |
| |
| commit fd933c00ebe220060e66fb136a7050a242456566 upstream. |
| |
| Three shall be the number thou shalt count, and the number of the |
| counting shall be three. Four shalt thou not count... |
| |
| One! Two! Five! |
| |
| Fixes: efb985f6b265 ("[PATCH] fbcon: Console Rotation - Add framebuffer console documentation") |
| Signed-off-by: Peter Rosin <peda@axentia.se> |
| Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Cc: Jonathan Corbet <corbet@lwn.net> |
| Cc: Matthew Wilcox <willy@infradead.org> |
| Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20190827110854.12574-2-peda@axentia.se |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt |
| index 5a865437b33f..1a3b2f256569 100644 |
| --- a/Documentation/fb/fbcon.txt |
| +++ b/Documentation/fb/fbcon.txt |
| @@ -124,7 +124,7 @@ C. Boot options |
| is typically located on the same video card. Thus, the consoles that |
| are controlled by the VGA console will be garbled. |
| |
| -4. fbcon=rotate:<n> |
| +5. fbcon=rotate:<n> |
| |
| This option changes the orientation angle of the console display. The |
| value 'n' accepts the following: |
| @@ -149,21 +149,21 @@ C. Boot options |
| Actually, the underlying fb driver is totally ignorant of console |
| rotation. |
| |
| -5. fbcon=margin:<color> |
| +6. fbcon=margin:<color> |
| |
| This option specifies the color of the margins. The margins are the |
| leftover area at the right and the bottom of the screen that are not |
| used by text. By default, this area will be black. The 'color' value |
| is an integer number that depends on the framebuffer driver being used. |
| |
| -6. fbcon=nodefer |
| +7. fbcon=nodefer |
| |
| If the kernel is compiled with deferred fbcon takeover support, normally |
| the framebuffer contents, left in place by the firmware/bootloader, will |
| be preserved until there actually is some text is output to the console. |
| This option causes fbcon to bind immediately to the fbdev device. |
| |
| -7. fbcon=logo-pos:<location> |
| +8. fbcon=logo-pos:<location> |
| |
| The only possible 'location' is 'center' (without quotes), and when |
| given, the bootup logo is moved from the default top-left corner |
| -- |
| 2.7.4 |
| |
