Commit 86fdf61e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2020-10-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



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().

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8585daa2-fcbc-3924-ac4f-e7b5668808e0@linux.intel.com
parents 549738f1 27204b99

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,11 @@ S: Odd Fixes 
F:	drivers/amba/

F:	include/linux/amba/bus.h









ARM PRIMECELL CLCD PL110 DRIVER









M:	Russell King <linux@armlinux.org.uk>









S:	Odd Fixes









F:	drivers/video/fbdev/amba-clcd.*

















ARM PRIMECELL KMI PL050 DRIVER









M:	Russell King <linux@armlinux.org.uk>









S:	Odd Fixes
































drivers/video/console/newport_con.c



+1
−6






























Original line number
Diff line number
Diff line







@@ -35,12 +35,6 @@

















#define FONT_DATA ((unsigned char *)font_vga_8x16.data)



















/* borrowed from fbcon.c */









#define REFCOUNT(fd)	(((int *)(fd))[-1])









#define FNTSIZE(fd)	(((int *)(fd))[-2])









#define FNTCHARCNT(fd)	(((int *)(fd))[-3])









#define FONT_EXTRA_WORDS 3



















static unsigned char *font_data[MAX_NR_CONSOLES];



















static struct newport_regs *npregs;








@@ -522,6 +516,7 @@ static int newport_set_font(int unit, struct console_font *op)







	FNTSIZE(new_data) = size;









	FNTCHARCNT(new_data) = op->charcount;









	REFCOUNT(new_data) = 0;	/* usage counter */









	FNTSUM(new_data) = 0;



















	p = new_data;









	for (i = 0; i < op->charcount; i++) {
































drivers/video/fbdev/Kconfig



+20
−0






























Original line number
Diff line number
Diff line







@@ -272,6 +272,26 @@ config FB_PM2_FIFO_DISCONNECT







	help









	  Support the Permedia2 FIFO disconnect feature.



















config FB_ARMCLCD









	tristate "ARM PrimeCell PL110 support"









	depends on ARM || ARM64 || COMPILE_TEST









	depends on FB && ARM_AMBA && HAS_IOMEM









	select FB_CFB_FILLRECT









	select FB_CFB_COPYAREA









	select FB_CFB_IMAGEBLIT









	select FB_MODE_HELPERS if OF









	select VIDEOMODE_HELPERS if OF









	select BACKLIGHT_CLASS_DEVICE if OF









	help









	  This framebuffer device driver is for the ARM PrimeCell PL110









	  Colour LCD controller.  ARM PrimeCells provide the building









	  blocks for System on a Chip devices.



















	  If you want to compile this as a module (=code which can be









	  inserted into and removed from the running kernel), say M









	  here and read <file:Documentation/kbuild/modules.rst>.  The module









	  will be called amba-clcd.



















config FB_ACORN









	bool "Acorn VIDC support"









	depends on (FB = y) && ARM && ARCH_ACORN
































drivers/video/fbdev/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -75,6 +75,7 @@ obj-$(CONFIG_FB_HIT)              += hitfb.o







obj-$(CONFIG_FB_ATMEL)		  += atmel_lcdfb.o









obj-$(CONFIG_FB_PVR2)             += pvr2fb.o









obj-$(CONFIG_FB_VOODOO1)          += sstfb.o









obj-$(CONFIG_FB_ARMCLCD)	  += amba-clcd.o









obj-$(CONFIG_FB_GOLDFISH)         += goldfishfb.o









obj-$(CONFIG_FB_68328)            += 68328fb.o









obj-$(CONFIG_FB_GBE)              += gbefb.o
































drivers/video/fbdev/amba-clcd.c
0 → 100644



+986
−0




























File added.
Preview size limit exceeded, changes collapsed.