[Intel-gfx] [PULL] drm-misc-fixes

[Maarten Lankhorst]

drm-misc-fixes-2020-10-01:
drm-misc-fixes for v5.9:
- Small doc fix.
- Re-add FB_ARMCLCD for android.
- Fix global-out-of-bounds read in fbcon_get_font().
The following changes since commit 19a508bd1ad8e444de86873bf2f2b2ab8edd6552:

  dmabuf: fix NULL pointer dereference in dma_buf_release() (2020-09-21 11:17:06 +0200)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2020-10-01

for you to fetch changes up to 27204b99b08289d0993cb77c22470034b5eb974d:

  drm: drm_dsc.h: fix a kernel-doc markup (2020-09-30 16:40:44 +0200)

----------------------------------------------------------------
drm-misc-fixes for v5.9:
- Small doc fix.
- Re-add FB_ARMCLCD for android.
- Fix global-out-of-bounds read in fbcon_get_font().

----------------------------------------------------------------
Mauro Carvalho Chehab (1):
      drm: drm_dsc.h: fix a kernel-doc markup

Peilin Ye (3):
      fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
      Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts
      fbcon: Fix global-out-of-bounds read in fbcon_get_font()

Peter Collingbourne (1):
      Partially revert "video: fbdev: amba-clcd: Retire elder CLCD driver"

 MAINTAINERS                             |   5 +
 drivers/video/console/newport_con.c     |   7 +-
 drivers/video/fbdev/Kconfig             |  20 +
 drivers/video/fbdev/Makefile            |   1 +
 drivers/video/fbdev/amba-clcd.c         | 986 ++++++++++++++++++++++++++++++++
 drivers/video/fbdev/core/fbcon.c        |  12 +
 drivers/video/fbdev/core/fbcon.h        |   7 -
 drivers/video/fbdev/core/fbcon_rotate.c |   1 +
 drivers/video/fbdev/core/tileblit.c     |   1 +
 include/drm/drm_dsc.h                   |   2 +-
 include/linux/amba/clcd-regs.h          |  87 +++
 include/linux/amba/clcd.h               | 290 ++++++++++
 include/linux/font.h                    |  13 +
 lib/fonts/font_10x18.c                  |   9 +-
 lib/fonts/font_6x10.c                   |   9 +-
 lib/fonts/font_6x11.c                   |   9 +-
 lib/fonts/font_7x14.c                   |   9 +-
 lib/fonts/font_8x16.c                   |   9 +-
 lib/fonts/font_8x8.c                    |   9 +-
 lib/fonts/font_acorn_8x8.c              |   9 +-
 lib/fonts/font_mini_4x6.c               |   8 +-
 lib/fonts/font_pearl_8x8.c              |   9 +-
 lib/fonts/font_sun12x22.c               |   9 +-
 lib/fonts/font_sun8x16.c                |   7 +-
 lib/fonts/font_ter16x32.c               |   9 +-
 25 files changed, 1469 insertions(+), 68 deletions(-)
 create mode 100644 drivers/video/fbdev/amba-clcd.c
 create mode 100644 include/linux/amba/clcd-regs.h
 create mode 100644 include/linux/amba/clcd.h