linux_dsm_epyc7002/drivers/gpu/drm/msm
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
..
adreno Linux 5.8-rc6 2020-07-24 08:48:05 +10:00
disp Linux 5.8-rc6 2020-07-24 08:48:05 +10:00
dsi drm/msm: remove _unlocked suffix in drm_gem_object_put_unlocked 2020-05-19 22:31:33 +01:00
edp Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into drm-next 2020-03-31 16:34:55 +10:00
hdmi Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into drm-next 2020-03-31 16:34:55 +10:00
Kconfig drm/msm/gpu: add ocmem init/cleanup functions 2019-10-07 08:17:39 -07:00
Makefile drm/msm/dpu: add support for color processing blocks in dpu driver 2020-05-18 09:26:32 -07:00
msm_atomic_trace.h drm/msm: add atomic traces 2019-09-03 16:17:02 -07:00
msm_atomic_tracepoints.c drm/msm: add atomic traces 2019-09-03 16:17:02 -07:00
msm_atomic.c drm/msm: add atomic traces 2019-09-03 16:17:02 -07:00
msm_debugfs.c drm: convert .debugfs_init() hook to return void. 2020-03-18 17:53:28 +01:00
msm_debugfs.h drm: convert .debugfs_init() hook to return void. 2020-03-18 17:53:28 +01:00
msm_drv.c drm-misc-next for v5.9: 2020-06-24 15:45:51 +10:00
msm_drv.h drm/msm: Refactor address space initialization 2020-05-23 13:38:16 -07:00
msm_fb.c drm/msm: remove _unlocked suffix in drm_gem_object_put_unlocked 2020-05-19 22:31:33 +01:00
msm_fbdev.c drm: Remove drm_fb_helper add, add all and remove connector calls 2020-03-06 14:19:58 +01:00
msm_fence.c
msm_fence.h
msm_gem_prime.c drm/msm: drop use of drmP.h 2019-09-03 16:16:57 -07:00
msm_gem_shrinker.c
msm_gem_submit.c drm-misc-next for v5.9: 2020-06-24 15:45:51 +10:00
msm_gem_vma.c drm/msm: Refactor address space initialization 2020-05-23 13:38:16 -07:00
msm_gem.c drm-misc-next for v5.9: 2020-06-24 15:45:51 +10:00
msm_gem.h drm/msm: add internal MSM_BO_MAP_PRIV flag 2020-05-18 09:26:33 -07:00
msm_gpu_trace.h drm/msm: add atomic traces 2019-09-03 16:17:02 -07:00
msm_gpu_tracepoints.c
msm_gpu.c drm-misc-next for v5.9: 2020-06-24 15:45:51 +10:00
msm_gpu.h drm msm next for 5.8-rc1 2020-06-08 11:33:38 -07:00
msm_gpummu.c drm/msm: Update the MMU helper function APIs 2020-05-23 13:38:16 -07:00
msm_iommu.c drm/msm: Update the MMU helper function APIs 2020-05-23 13:38:16 -07:00
msm_kms.h drm/msm/dpu: async commit support 2019-09-03 16:17:01 -07:00
msm_mmu.h drm/msm: Update the MMU helper function APIs 2020-05-23 13:38:16 -07:00
msm_perf.c drm/msm: drop use of drmP.h 2019-09-03 16:16:57 -07:00
msm_rd.c drm/msm: Fix undefined "rd_full" link error 2020-05-18 09:26:32 -07:00
msm_ringbuffer.c
msm_ringbuffer.h
msm_submitqueue.c drm/msm: fix potential memleak in error branch 2020-06-11 20:06:12 -07:00
NOTES