Dave Airlie 41206a073c Merge v5.8-rc6 into drm-next ...

I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

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

2020-07-24 08:48:05 +10:00

..

bitblit.c

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

cfbcopyarea.c

framebuffer: fix screen corruption when copying

2014-09-30 13:39:50 +03:00

cfbfillrect.c

…

cfbimgblt.c

…

fb_cmdline.c

video/fbdev: refactor video= cmdline parsing

2019-02-08 19:24:47 +01:00

fb_ddc.c

fb_ddc: Allow I2C adapters without SCL read capability

2015-09-30 10:46:55 +03:00

fb_defio.c

video: fb_defio: preserve user fb_ops

2019-12-03 11:10:19 +02:00

fb_draw.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fb_notify.c

…

fb_sys_fops.c

…

fbcmap.c

fbdev: lock_fb_info cannot fail

2019-06-12 20:28:38 +02:00

fbcon_ccw.c

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

fbcon_cw.c

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

fbcon_rotate.c

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

fbcon_rotate.h

fbcon: Make fbcon a built-time depency for fbdev

2017-08-01 17:32:07 +02:00

fbcon_ud.c

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

fbcon.c

Merge v5.8-rc6 into drm-next

2020-07-24 08:48:05 +10:00

fbcon.h

fbcon: s/struct display/struct fbcon_display/

2019-06-12 20:27:34 +02:00

fbcvt.c

fbdev: fix CVT vertical front and back porch values

2015-01-27 13:35:37 +02:00

fbmem.c

fbmem: Adjust indentation in fb_prepare_logo and fb_blank

2020-01-15 17:31:47 +01:00

fbmon.c

video: fbdev: Replace HTTP links with HTTPS ones

2020-07-20 11:47:29 +02:00

fbsysfs.c

fbdev: remove FBINFO_MISC_USEREVENT around fb_blank

2019-06-12 20:30:06 +02:00

Makefile

fbdev: remove object duplication in Makefile

2020-01-15 17:31:52 +01:00

modedb.c

fbdev: Ditch fb_edid_add_monspecs

2019-07-23 14:17:22 +02:00

softcursor.c

fbcon: Make fbcon a built-time depency for fbdev

2017-08-01 17:32:07 +02:00

svgalib.c

…

syscopyarea.c

video: fbdev: fix sys_copyarea

2015-01-30 09:46:59 +02:00

sysfillrect.c

…

sysimgblt.c

…

tileblit.c

fbcon: add fbcon=margin:<color> command line option

2017-08-18 19:56:40 +02:00