Dave Airlie 3fce461827 BackMerge v4.18-rc7 into drm-next ...

rmk requested this for armada and I think we've had a few
conflicts build up.

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

2018-07-30 10:39:22 +10:00

..

armada_510.c

drm/armada: Remove unused #include <drmP.h>

2017-09-29 09:35:36 +02:00

armada_crtc.c

drm/armada: fix irq handling

2018-07-09 11:32:58 +01:00

armada_crtc.h

drm/armada: move overlay plane register update generation

2017-12-08 12:21:53 +00:00

armada_debugfs.c

drm/armada: Remove armada_drm_debugfs_cleanup()

2017-03-01 16:09:51 +01:00

armada_drm.h

drm/armada: Use drm_fb_helper_lastclose() and _poll_changed()

2017-12-08 13:03:52 +01:00

armada_drv.c

drm/armada: Use drm_fb_helper_lastclose() and _poll_changed()

2017-12-08 13:03:52 +01:00

armada_fb.c

drm/armada: Move GEM BO to drm_framebuffer

2018-05-18 14:52:36 +01:00

armada_fb.h

drm/armada: Move GEM BO to drm_framebuffer

2018-05-18 14:52:36 +01:00

armada_fbdev.c

drm/armada: Use drm_fb_helper_lastclose() and _poll_changed()

2017-12-08 13:03:52 +01:00

armada_gem.c

dma-buf: remove kmap_atomic interface

2018-06-20 15:59:34 +02:00

armada_gem.h

drm/armada: Use .dumb_map_offset and .dumb_destroy defaults

2017-09-02 14:22:20 +02:00

armada_hw.h

drm/armada: fix colorkey mode property

2018-07-09 11:32:56 +01:00

armada_ioctlP.h

DRM: Armada: Add Armada DRM driver

2013-10-12 10:13:40 +01:00

armada_overlay.c

drm/armada: fix colorkey mode property

2018-07-09 11:32:56 +01:00

armada_trace.c

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

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

armada_trace.h

drm/armada: expand overlay trace entry

2017-12-08 12:22:02 +00:00

Kconfig

drm: add more MMU dependencies

2017-01-11 17:24:58 +01:00

Makefile

Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

2017-11-15 20:42:10 -08:00