openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/gpu/drm/exynos
History
Dave Airlie e8115e79aa Linux 3.18-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
 		2014-12-02 10:58:33 +10:00
..
Kconfig drm/panel: Changes for v3.17-rc1 2014-08-07 19:51:52 +10:00
Makefile drm/exynos: add DSIM driver 2014-04-04 21:24:48 +09:00
exynos_dp_core.c drm/exynos/dp: stop using display->ctx pointer 2014-11-24 18:02:56 +09:00
exynos_dp_core.h drm/exynos/dp: embed display into private context 2014-11-24 18:02:56 +09:00
exynos_dp_reg.c drm/exynos: Fix checkpatch warning in exynos_dp_reg.c 2014-06-02 02:07:12 +09:00
exynos_dp_reg.h drm/exynos: Move dp driver from video/ to drm/ 2014-03-24 00:36:34 +09:00
exynos_drm_buf.c drm/exynos: fix return value check in lowlevel_buffer_allocate() 2013-09-16 21:57:08 +09:00
exynos_drm_buf.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_connector.c drm/exynos: use helpers 2014-07-18 14:24:34 +10:00
exynos_drm_connector.h drm/exynos: Remove dpms link between encoder/connector 2014-03-24 00:36:30 +09:00
exynos_drm_core.c drm/exynos: add component framework support 2014-06-02 02:07:04 +09:00
exynos_drm_crtc.c drm/exynos: enable vblank after DPMS on 2014-11-03 01:51:28 +09:00
exynos_drm_crtc.h drm/exynos: Replace repeated declarations by #include "exynos_drm_drv.h" 2014-11-24 18:02:51 +09:00
exynos_drm_dmabuf.c dma-buf: use reservation objects 2014-07-08 13:03:20 -07:00
exynos_drm_dmabuf.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_dpi.c drm/exynos/dpi: stop using display->ctx pointer 2014-11-24 18:02:56 +09:00
exynos_drm_drv.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
exynos_drm_drv.h drm/exynos: Fix exynos_dpi_remove() parameter 2014-11-25 11:58:41 +09:00
exynos_drm_dsi.c drm/exynos: dsi: set TE GPIO IRQ status as IRQ_NOAUTOEN 2014-11-24 18:02:54 +09:00
exynos_drm_encoder.c drm/exynos: Restrict plane loops to only operate on overlay planes (v2) 2014-04-01 20:11:18 -04:00
exynos_drm_encoder.h drm/exynos: remove extra declaration of struct exynos_drm_manager 2014-11-24 18:02:50 +09:00
exynos_drm_fb.c drm/exynos/fb: free exynos framebuffer on error 2014-09-20 00:56:14 +09:00
exynos_drm_fb.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fbdev.c drm/exynos/fbdev: fix fbdev gem object cleanup 2014-09-20 00:56:14 +09:00
exynos_drm_fbdev.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fimc.c drm/exynos/fimc: fix source buffer registers 2014-09-20 00:56:13 +09:00
exynos_drm_fimc.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fimd.c drm/exynos: avoid leak if exynos_dpi_probe() fails 2014-11-25 11:58:43 +09:00
exynos_drm_g2d.c drm/exynos: g2d: fix null pointer dereference 2014-11-24 18:02:48 +09:00
exynos_drm_g2d.h drm/exynos: add G2D driver 2012-05-17 20:14:48 +09:00
exynos_drm_gem.c drm/exynos: use drm generic mmap interface 2014-09-20 01:00:13 +09:00
exynos_drm_gem.h drm: Extract <drm/drm_gem.h> 2014-09-24 11:43:41 +10:00
exynos_drm_gsc.c drm/exynos/ipp: replace work_struct casting with better constructs 2014-09-20 00:56:12 +09:00
exynos_drm_gsc.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_iommu.c arm: dma-mapping: remove order parameter from arm_iommu_create_mapping() 2014-02-28 11:55:18 +01:00
exynos_drm_iommu.h drm/exynos: remove uneeded declaration of struct dma_iommu_mapping 2014-11-24 18:02:50 +09:00
exynos_drm_ipp.c drm/exynos/ipp: fix error return code 2014-11-24 23:52:04 +09:00
exynos_drm_ipp.h drm/exynos/ipp: remove unused field in command node 2014-09-20 00:56:10 +09:00
exynos_drm_plane.c drm/exynos: switch to universal plane API 2014-09-20 01:17:53 +09:00
exynos_drm_plane.h drm/exynos: switch to universal plane API 2014-09-20 01:17:53 +09:00
exynos_drm_rotator.c drm/exynos/ipp: replace work_struct casting with better constructs 2014-09-20 00:56:12 +09:00
exynos_drm_rotator.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_vidi.c drm/exynos: vidi: add component support 2014-11-25 11:58:37 +09:00
exynos_drm_vidi.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_hdmi.c drm/exynos/hdmi: stop using display->ctx pointer 2014-11-24 18:02:55 +09:00
exynos_mixer.c drm/exynos/mixer: stop using manager->ctx pointer 2014-11-24 18:02:54 +09:00
exynos_mixer.h drm/exynos: Remove exynos_drm_hdmi shim 2014-03-24 00:36:32 +09:00
regs-fimc.h drm/exynos: add device tree support for fimc ipp driver 2013-04-29 14:35:32 +09:00
regs-gsc.h drm/exynos: add gsc ipp driver 2012-12-15 02:40:00 +09:00
regs-hdmi.h drm/exynos: add hdmiphy power on/off sequence 2014-06-02 02:07:15 +09:00
regs-mixer.h drm/exynos: stop mixer before gating clocks during poweroff 2014-06-24 11:27:29 +09:00
regs-rotator.h drm/exynos: add rotator ipp driver 2012-12-15 02:39:41 +09:00
regs-vp.h drm/exynos: added hdmi display support 2011-12-29 11:21:42 +09:00