Merge tag 'drm-next-2020-10-23' of git://anongit.freedesktop.org/drm/drm

Pull more drm fixes from Dave Airlie:
 "This should be the last round of things for rc1, a bunch of i915
  fixes, some amdgpu, more font OOB fixes and one ttm fix just found
  reading code:

  fbcon/fonts:
   - Two patches to prevent OOB access

  ttm:
   - fix for evicition value range check

  amdgpu:
   - Sienna Cichlid fixes
   - MST manager resource leak fix
   - GPU reset fix

  amdkfd:
   - Luxmark fix for Navi1x

  i915:
   - Tweak initial DPCD backlight.enabled value (Sean)
   - Initialize reserved MOCS indices (Ayaz)
   - Mark initial fb obj as WT on eLLC machines to avoid rcu lockup (Ville)
   - Support parsing of oversize batches (Chris)
   - Delay execlists processing for TGL (Chris)
   - Use the active reference on the vma during error capture (Chris)
   - Widen CSB pointer (Chris)
   - Wait for CSB entries on TGL (Chris)
   - Fix unwind for scratch page allocation (Chris)
   - Exclude low patches of stolen memory (Chris)
   - Force VT'd workarounds when running as a guest OS (Chris)
   - Drop runtime-pm assert from vpgu io accessors (Chris)"

* tag 'drm-next-2020-10-23' of git://anongit.freedesktop.org/drm/drm: (31 commits)
  drm/amdgpu: correct the cu and rb info for sienna cichlid
  drm/amd/pm: remove the average clock value in sysfs
  drm/amd/pm: fix pp_dpm_fclk
  Revert drm/amdgpu: disable sienna chichlid UMC RAS
  drm/amd/pm: fix pcie information for sienna cichlid
  drm/amdkfd: Use same SQ prefetch setting as amdgpu
  drm/amd/swsmu: correct wrong feature bit mapping
  drm/amd/psp: Fix sysfs: cannot create duplicate filename
  drm/amd/display: Avoid MST manager resource leak.
  drm/amd/display: Revert "drm/amd/display: Fix a list corruption"
  drm/amdgpu: update golden setting for sienna_cichlid
  drm/amd/swsmu: add missing feature map for sienna_cichlid
  drm/amdgpu: correct the gpu reset handling for job != NULL case
  drm/amdgpu: add rlc iram and dram firmware support
  drm/amdgpu: add function to program pbb mode for sienna cichlid
  drm/i915: Drop runtime-pm assert from vgpu io accessors
  drm/i915: Force VT'd workarounds when running as a guest OS
  drm/i915: Exclude low pages (128KiB) of stolen from use
  drm/i915/gt: Onion unwind for scratch page allocation failure
  drm/ttm: fix eviction valuable range check.
  ...

diff --combined Documentation/fb/fbcon.rst
index 9aad964b767ce27ab91a302ab79430c64b42bc54,71cade19d92c51d947cbed4006e2878ed1532f1f..57f66de2f7e167666267d23ac6a327f3ed91c2d4
--- 1/Documentation/fb/fbcon.rst
--- 2/Documentation/fb/fbcon.rst
+++ b/Documentation/fb/fbcon.rst
@@@ -81,14 -81,21 +81,14 @@@ C. Boot option
  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,
        such as vga16fb.
  
 -2. fbcon=scrollback:<value>[k]
  
 -      The scrollback buffer is memory that is used to preserve display
 -      contents that has already scrolled past your view.  This is accessed
 -      by using the Shift-PageUp key combination.  The value 'value' is any
 -      integer. It defaults to 32KB.  The 'k' suffix is optional, and will
 -      multiply the 'value' by 1024.
 -
 -3. fbcon=map:<0123>
 +2. fbcon=map:<0123>
  
        This is an interesting option. It tells which driver gets mapped to
        which console. The value '0123' is a sequence that gets repeated until
@@@ -109,7 -116,7 +109,7 @@@
        Later on, when you want to map the console the to the framebuffer
        device, you can use the con2fbmap utility.
  
 -4. fbcon=vc:<n1>-<n2>
 +3. fbcon=vc:<n1>-<n2>
  
        This option tells fbcon to take over only a range of consoles as
        specified by the values 'n1' and 'n2'. The rest of the consoles
@@@ -120,7 -127,7 +120,7 @@@
        is typically located on the same video card.  Thus, the consoles that
        are controlled by the VGA console will be garbled.
  
 -5. fbcon=rotate:<n>
 +4. fbcon=rotate:<n>
  
        This option changes the orientation angle of the console display. The
        value 'n' accepts the following:
@@@ -145,21 -152,21 +145,21 @@@
        Actually, the underlying fb driver is totally ignorant of console
        rotation.
  
 -6. fbcon=margin:<color>
 +5. 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.
  
 -7. fbcon=nodefer
 +6. 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.
  
 -8. fbcon=logo-pos:<location>
 +7. 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
@@@ -167,7 -174,7 +167,7 @@@
        displayed due to multiple CPUs, the collected line of logos is moved
        as a whole.
  
 -9. fbcon=logo-count:<n>
 +8. fbcon=logo-count:<n>
  
        The value 'n' overrides the number of bootup logos. 0 disables the
        logo, and -1 gives the default which is the number of online CPUs.