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 <[email protected]>

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

..

Kconfig

…

Makefile

…

meson_crtc.c

drm/meson: crtc: handle commit of Amlogic FBC frames

2020-07-03 10:12:30 +02:00

meson_crtc.h

…

meson_drv.c

Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

2020-06-24 15:45:51 +10:00

meson_drv.h

drm/meson: overlay: setup overlay for Amlogic FBC

2020-07-03 10:12:29 +02:00

meson_dw_hdmi.c

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

2020-06-29 12:16:26 +02:00

meson_dw_hdmi.h

…

meson_osd_afbcd.c

…

meson_osd_afbcd.h

…

meson_overlay.c

drm/meson: overlay: fix build failure

2020-07-07 15:53:44 +02:00

meson_overlay.h

…

meson_plane.c

…

meson_plane.h

…

meson_rdma.c

…

meson_rdma.h

…

meson_registers.h

Merge v5.8-rc6 into drm-next

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

meson_vclk.c

…

meson_vclk.h

…

meson_venc_cvbs.c

…

meson_venc_cvbs.h

…

meson_venc.c

…

meson_venc.h

…

meson_viu.c

drm/meson: viu: fix setting the OSD burst length in VIU_OSD1_FIFO_CTRL_STAT

2020-07-02 10:36:56 +02:00

meson_viu.h

…

meson_vpp.c

…

meson_vpp.h

…