Dave Airlie 52139bdea1 Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next ... This set of patches adjust the setup of the HDMI CTS/N values for audio support to be compliant with the work-around given in the iMX6 errata documentation as part of the preparation for integrating audio support for this driver, and also update the HDMI phy configuration for Rockchip devices to improve the HDMI eye pattern. * 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: drm: rockchip/dw_hdmi-rockchip: improve for HDMI electrical test drm: bridge/dw_hdmi: separate VLEVCTRL settting into platform driver drm: bridge/dw_hdmi: fixed codec style drm: bridge/dw_hdmi: adjust n/cts setting order drm: bridge/dw_hdmi: protect n/cts setting with a mutex drm: bridge/dw_hdmi: combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts() Conflicts: drivers/gpu/drm/imx/dw_hdmi-imx.c		2015-04-16 08:33:30 +10:00
..
dw_hdmi-imx.c	Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next	2015-04-16 08:33:30 +10:00
imx-drm-core.c	imx-drm changes to use media bus formats and LDB drm_panel support	2015-04-13 17:28:57 +10:00
imx-drm.h	drm/imx: consolidate bus format variable names	2015-03-31 11:59:34 +02:00
imx-ldb.c	drm/imx: imx-ldb: allow to determine bus format from the connected panel	2015-03-31 12:44:50 +02:00
imx-tve.c	drm/imx: consolidate bus format variable names	2015-03-31 11:59:34 +02:00
ipuv3-crtc.c	drm/imx: consolidate bus format variable names	2015-03-31 11:59:34 +02:00
ipuv3-plane.c	drm/imx: Add support for interlaced scanout	2015-03-31 11:59:32 +02:00
ipuv3-plane.h	drm/imx: Add support for interlaced scanout	2015-03-31 11:59:32 +02:00
Kconfig	drm/imx: imx-ldb: add drm_panel support	2015-03-31 12:44:49 +02:00
Makefile	drm: imx: imx-hdmi: move imx-hdmi to bridge/dw_hdmi	2015-01-07 18:31:56 +01:00
parallel-display.c	drm/imx: consolidate bus format variable names	2015-03-31 11:59:34 +02:00