diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-20 23:52:50 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-20 23:58:39 +0300 |
| commit | 7e13256dfe22b0d2e49cbfdb75bdc57e059d6c50 (patch) | |
| tree | bd7896c9b19207d74755f46e98eb38cbb33b376e /Documentation | |
| parent | 40b99050455b9a6cb8faf15dcd41888312184720 (diff) | |
| parent | 272d70895113ef00c03ab325787d159ee51718c8 (diff) | |
| download | linux-7e13256dfe22b0d2e49cbfdb75bdc57e059d6c50.tar.xz | |
Merge tag 'drm-misc-next-fixes-2020-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Two patches to prevent out-of-bands accesses on fonts buffers
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020141445.4jisqylfbusdnzge@gilmour
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fb/fbcon.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fb/fbcon.rst b/Documentation/fb/fbcon.rst index a7b487cba307..71cade19d92c 100644 --- a/Documentation/fb/fbcon.rst +++ b/Documentation/fb/fbcon.rst @@ -81,7 +81,7 @@ C. Boot options 1. fbcon=font:<name> Select the initial font to use. The value 'name' can be any of the - compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6, + compiled-in fonts: 10x18, 6x10, 6x8, 7x14, Acorn8x8, MINI4x6, PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8. Note, not all drivers can handle font with widths not divisible by 8, |