alistair23-linux/drivers/gpu/drm/exynos
Daniel Vetter 646db260b8 Linux 4.3-rc2
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJV/yX5AAoJEHm+PkMAQRiGUc4IAIFtSt2EORex45d2c64Varjm
 4wVJM6k1xz0e8c5bI5D03y/WaefIC2LlKHtWw4+TytnwWEryuGQ1IitvDPZLIntk
 I2tUN1IzyxZrJcG2GyfozjxSxeIcaL7us5j7555kEaRVWMamqDaQgVgEKFRqD43N
 M4y8qRUeU3OiaL3OhQ9beSfpI/XqjaT+ECGO5HKC3NOJtTrD+cFqLAG9ScCPhvtk
 YrrXx3K6J3mylvdvJ5W6JlxOrhFMO+YzViy2bRY8OnAR2vD88p61eT8V2+ENbnMj
 +AqXS4HOBpJ6I1Qhff99r0YyvVT/ln9dW7qLAXK3WG27z6HOSWr8KWNUyQD2VLE=
 =9yBb
 -----END PGP SIGNATURE-----

Merge tag 'v4.3-rc2' into topic/drm-misc

Backmerge Linux 4.3-rc2 because of conflicts in the dp helper code
between bugfixes and new code. Just adjacent lines really.

On top of that there's a silent conflict in the new fsl-dcu driver
merged into 4.3 and

commit 844f9111f6
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Wed Sep 2 10:42:40 2015 +0200

    drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.

which Thierry Reding spotted and provided a fixup for.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-09-24 17:18:41 +02:00
..
exynos7_drm_decon.c drm/exynos: Properly report supported formats for each device 2015-08-31 01:03:02 +09:00
exynos5433_drm_decon.c drm/exynos: Properly report supported formats for each device 2015-08-31 01:03:02 +09:00
exynos_dp_core.c drm/exynos: remove struct exynos_drm_encoder layer 2015-08-16 10:35:54 +09:00
exynos_dp_core.h drm/exynos: remove struct exynos_drm_encoder layer 2015-08-16 10:35:54 +09:00
exynos_dp_reg.c
exynos_dp_reg.h
exynos_drm_core.c drm/exynos: remove struct exynos_drm_encoder layer 2015-08-16 10:35:54 +09:00
exynos_drm_crtc.c drm/exynos: remove wait queue for pending page flip 2015-08-31 00:27:38 +09:00
exynos_drm_crtc.h drm/exynos: wait all planes updates to finish 2015-08-31 00:27:38 +09:00
exynos_drm_dpi.c drm/exynos: remove struct exynos_drm_encoder layer 2015-08-16 10:35:54 +09:00
exynos_drm_drv.c drm/atomic-helper: Add option to update planes only on active crtc 2015-09-08 13:49:08 +02:00
exynos_drm_drv.h drm/exynos: remove wait queue for pending page flip 2015-08-31 00:27:38 +09:00
exynos_drm_dsi.c drm/exynos: remove struct exynos_drm_encoder layer 2015-08-16 10:35:54 +09:00
exynos_drm_fb.c drm/exynos: remove buf_cnt from struct exynos_drm_fb 2015-09-02 23:10:34 +09:00
exynos_drm_fb.h drm/exynos: remove exynos_drm_fb_get_buf_cnt() 2015-09-02 23:10:34 +09:00
exynos_drm_fbdev.c drm/exynos: update exynos_drm_framebuffer_init() for multiple buffers 2015-09-02 23:10:32 +09:00
exynos_drm_fbdev.h
exynos_drm_fimc.c
exynos_drm_fimc.h
exynos_drm_fimd.c drm/exynos: Properly report supported formats for each device 2015-08-31 01:03:02 +09:00
exynos_drm_g2d.c media updates for v4.3-rc1 2015-09-11 16:42:39 -07:00
exynos_drm_g2d.h
exynos_drm_gem.c media updates for v4.3-rc1 2015-09-11 16:42:39 -07:00
exynos_drm_gem.h drm/exynos: merge exynos_drm_buf.c to exynos_drm_gem.c 2015-08-16 14:39:32 +09:00
exynos_drm_gsc.c
exynos_drm_gsc.h
exynos_drm_iommu.c
exynos_drm_iommu.h
exynos_drm_ipp.c
exynos_drm_ipp.h
exynos_drm_mic.c
exynos_drm_plane.c drm/exynos: remove exynos_drm_fb_get_buf_cnt() 2015-09-02 23:10:34 +09:00
exynos_drm_plane.h drm/exynos: Properly report supported formats for each device 2015-08-31 01:03:02 +09:00
exynos_drm_rotator.c
exynos_drm_rotator.h
exynos_drm_vidi.c drm/exynos: Properly report supported formats for each device 2015-08-31 01:03:02 +09:00
exynos_drm_vidi.h
exynos_hdmi.c drm/exynos: remove struct exynos_drm_encoder layer 2015-08-16 10:35:54 +09:00
exynos_mixer.c drm/exynos: Properly report supported formats for each device 2015-08-31 01:03:02 +09:00
exynos_mixer.h
Kconfig media updates for v4.3-rc1 2015-09-11 16:42:39 -07:00
Makefile drm/exynos: merge exynos_drm_buf.c to exynos_drm_gem.c 2015-08-16 14:39:32 +09:00
regs-fimc.h
regs-gsc.h
regs-hdmi.h
regs-mixer.h
regs-rotator.h
regs-vp.h