Gustavo Padovan d98c71dadc Merge drm-upstream/drm-next into drm-misc-next ...

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

2018-06-20 13:22:22 -03:00

..

adreno

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

2018-05-11 18:08:10 +02:00

disp

Merge drm-upstream/drm-next into drm-misc-next

2018-06-20 13:22:22 -03:00

dsi

drm/msm: Fix NULL deref on bind/probe deferral

2018-06-04 12:50:42 -04:00

edp

drm/msm/edp: convert to msm_clk_get()

2017-10-28 11:01:33 -04:00

hdmi

drm/msm/hdmi: fix semicolon.cocci warnings

2018-02-20 10:41:21 -05:00

Kconfig

drm/msm/dsi: Add skeleton 10nm PHY/PLL code

2018-02-20 10:41:20 -05:00

Makefile

drm/msm: rename mdp->disp

2018-03-19 06:33:35 -04:00

msm_atomic.c

drm/msm: Switch to atomic_helper_commit()

2018-06-04 12:50:37 -04:00

msm_debugfs.c

drm/msm: Don't setup control node debugfs files

2018-05-03 21:26:10 +02:00

msm_debugfs.h

drm/msm: Remove msm_debugfs_cleanup()

2017-03-08 11:24:45 +01:00

msm_drv.c

drm/msm: Switch to atomic_helper_commit()

2018-06-04 12:50:37 -04:00

msm_drv.h

drm/msm: Switch to atomic_helper_commit()

2018-06-04 12:50:37 -04:00

msm_fb.c

drm/msm: Add modifier to mdp_get_format arguments

2018-06-03 16:48:59 -04:00

msm_fbdev.c

drm/msm: don't deref error pointer in the msm_fbdev_create error path

2018-06-03 16:49:00 -04:00

msm_fence.c

drm/msm: Support multiple ringbuffers

2017-10-28 11:01:36 -04:00

msm_fence.h

drm/msm: strip out msm_fence_cb

2018-03-19 06:33:35 -04:00

msm_gem_prime.c

drm/msm: Expose our reservation object when exporting a dmabuf.

2017-05-27 13:48:26 -04:00

msm_gem_shrinker.c

drm/msm: Separate locking of buffer resources from struct_mutex

2017-06-17 08:03:07 -04:00

msm_gem_submit.c

drm/msm: add sudo flag to submit ioctl

2018-02-20 10:41:20 -05:00

msm_gem_vma.c

drm/msm: Pass the correct aperture end to drm_mm_init

2018-02-20 10:41:22 -05:00

msm_gem.c

drm/msm: Fix possible null dereference on failure of get_pages()

2018-06-03 16:48:59 -04:00

msm_gem.h

drm/msm: add sudo flag to submit ioctl

2018-02-20 10:41:20 -05:00

msm_gpu.c

drm/msm/gpu: Set number of clocks to 0 if the list allocation fails

2018-02-20 10:41:22 -05:00

msm_gpu.h

drm/msm: add a5xx specific debugfs

2018-02-20 10:41:20 -05:00

msm_iommu.c

drm/msm: pm runtime support for iommu

2017-04-08 06:59:31 -04:00

msm_kms.h

drm/msm: Don't subclass drm_atomic_state anymore

2018-06-03 16:49:00 -04:00

msm_mmu.h

drm/msm: let gpu wire up it's own fault handler

2017-02-06 11:28:42 -05:00

msm_perf.c

drm/msm: Remove msm_debugfs_cleanup()

2017-03-08 11:24:45 +01:00

msm_rd.c

Linux 4.14-rc7

2017-11-02 12:40:41 +10:00

msm_ringbuffer.c

drm/msm: Replace gem_object deprecated functions

2018-02-20 10:41:21 -05:00

msm_ringbuffer.h

drm/msm: Implement preemption for A5XX targets

2017-10-28 11:01:38 -04:00

msm_submitqueue.c

drm/msm: Support multiple ringbuffers

2017-10-28 11:01:36 -04:00

NOTES

…