UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/gpu/drm/meson
History
Dave Airlie 41206a073c Linux 5.8-rc6 
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl8UzA4eHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGQ7cH/3v+Gv+SmHJCvaT2
 CSu0+7okVnYbY3UTb3hykk7/aOqb6284KjxR03r0CWFzsEsZVhC5pvvruASSiMQg
 Pi04sLqv6CsGLHd1n+pl4AUYEaxq6k4KS3uU3HHSWxrahDDApQoRUx2F8lpOxyj8
 RiwnoO60IMPA7IFJqzcZuFqsgdxqiiYvnzT461KX8Mrw6fyMXeR2KAj2NwMX8dZN
 At21Sf8+LSoh6q2HnugfiUd/jR10XbfxIIx2lXgIinb15GXgWydEQVrDJ7cUV7ix
 Jd0S+dtOtp+lWtFHDoyjjqqsMV7+G8i/rFNZoxSkyZqsUTaKzaR6JD3moSyoYZgG
 0+eXO4A=
 =9EpR
 -----END PGP SIGNATURE-----

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
..
Kconfig Merge remote-tracking branch 'drm/drm-next' into drm-misc-next 2019-05-28 09:39:08 +02:00
Makefile drm/meson: Add AFBCD module driver 2019-12-10 10:09:01 +01:00
meson_crtc.c drm/meson: crtc: handle commit of Amlogic FBC frames 2020-07-03 10:12:30 +02:00
meson_crtc.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13 2019-05-21 11:28:45 +02:00
meson_drv.c drm-misc-next for v5.9: 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 drm: meson: global clean-up 2019-08-09 12:06:14 +02:00
meson_osd_afbcd.c drm/meson: Add AFBCD module driver 2019-12-10 10:09:01 +01:00
meson_osd_afbcd.h drm/meson: Add AFBCD module driver 2019-12-10 10:09:01 +01:00
meson_overlay.c drm/meson: overlay: fix build failure 2020-07-07 15:53:44 +02:00
meson_overlay.h drm/meson: Support Overlay plane for video rendering 2018-11-13 13:27:51 +01:00
meson_plane.c drm/meson: Remove unneeded semicolon 2020-04-28 11:17:27 +02:00
meson_plane.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13 2019-05-21 11:28:45 +02:00
meson_rdma.c drm: meson: fix address type confusion 2020-01-08 13:51:56 +01:00
meson_rdma.h drm/meson: add RDMA module driver 2019-12-10 10:08:45 +01:00
meson_registers.h Linux 5.8-rc6 2020-07-24 08:48:05 +10:00
meson_vclk.c drm/meson: add mode selection limits against specific SoC revisions 2020-05-05 10:19:33 +02:00
meson_vclk.h drm/meson: add mode selection limits against specific SoC revisions 2020-05-05 10:19:33 +02:00
meson_venc.c drm/meson: venc: add support for YUV420 setup 2020-03-10 10:51:24 +01:00
meson_venc.h drm/meson: venc: add support for YUV420 setup 2020-03-10 10:51:24 +01:00
meson_venc_cvbs.c drm: Nuke mode->vrefresh 2020-05-27 14:31:42 +03:00
meson_venc_cvbs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13 2019-05-21 11:28:45 +02:00
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 drm/meson: viu: add AFBC modules routing functions 2019-12-10 10:09:38 +01:00
meson_vpp.c drm: meson: use match data to detect vpu compatibility 2019-08-22 17:54:05 +02:00
meson_vpp.h drm/meson: drop use of drmP.h 2019-07-17 12:47:57 +02:00