Dave Airlie 91915260ea Merge tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-next ... Bit a bit -fixes pull request in the merge window than usual dua to two feauture-y things: - Display CRCs are now enabled on all platforms, including the odd DP case on gm45/vlv. Since this is a testing-only feature it should ever hurt, but I figured it'll help with regression-testing -fixes. So I left it in and didn't postpone it to 3.14. - Display power well refactoring from Imre. Would have caused major pain conflict with the bdw stage 1 patches if I'd postpone this to -next. It's only an relatively small interface rework, so shouldn't cause pain. It's also been in my tree since almost 3 weeks already. That accounts for about two thirds of the pull, otherwise just bugfixes: - vlv backlight fix from Jesse/Jani - vlv vblank timestamp fix from Jesse - improved edp detection through vbt from Ville (fixes a vlv issue) - eDP vdd fix from Paulo - fixes for dvo lvds on i830M - a few smaller things all over Note: This contains a backmerge of v3.12. Since the -internal branch always applied on top of -nightly I need that unified base to merge bdw patches. So you'll get a conflict with radeon connector props when pulling this (and nouveau/master will also conflict a bit when Ben doesn't rebase). The backmerge itself only had conflicts in drm/i915. There's also a tiny conflict between Jani's backlight fix and your sysfs lifetime fix in drm-next. * tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel: (940 commits) drm/i915/vlv: use per-pipe backlight controls v2 drm/i915: make backlight functions take a connector drm/i915: move opregion asle request handling to a work queue drm/i915/vlv: use PIPE_START_VBLANK interrupts on VLV drm/i915: Make intel_dp_is_edp() less specific drm/i915: Give names to the VBT child device type bits drm/i915/vlv: enable HDA display audio for Valleyview2 drm/i915/dvo: call ->mode_set callback only when the port is running drm/i915: avoid unclaimed registers when capturing the error state drm/i915: Enable DP port CRC for the "auto" source on g4x/vlv drm/i915: scramble reset support for DP port CRC on vlv drm/i915: scramble reset support for DP port CRC on g4x drm/i916: add "auto" pipe CRC source ... Conflicts: MAINTAINERS drivers/gpu/drm/i915/intel_panel.c drivers/gpu/drm/nouveau/core/subdev/mc/base.c drivers/gpu/drm/radeon/atombios_encoders.c drivers/gpu/drm/radeon/radeon_connectors.c		2013-11-08 16:34:39 +10:00
..
armada_drm.h	DRM: Armada: Add Armada DRM driver	2013-10-12 10:13:40 +01:00
drm_fourcc.h
drm_mode.h	Merge tag 'v3.12' into drm-intel-next	2013-11-04 16:28:52 +01:00
drm_sarea.h
drm.h	drm: Add a STEREO_3D capability to the SET_CLIENT_CAP ioctl	2013-10-01 07:45:27 +02:00
exynos_drm.h	drm/exynos: consider both case of vflip and hflip.	2013-01-04 15:54:33 +09:00
i810_drm.h
i915_drm.h	drm/i915: Add second slice l3 remapping	2013-09-19 20:37:04 +02:00
Kbuild	drm/msm: add a3xx gpu support	2013-08-24 14:57:18 -04:00
mga_drm.h
msm_drm.h	drm/msm: add a3xx gpu support	2013-08-24 14:57:18 -04:00
nouveau_drm.h
omap_drm.h	drm/omap: move out of staging	2013-02-16 17:38:06 -05:00
qxl_drm.h	drm: add new QXL driver. (v1.4)	2013-04-12 13:51:07 +10:00
r128_drm.h
radeon_drm.h	drm/radeon/cik: Add tiling mode index for 1D tiled depth/stencil surfaces	2013-09-20 17:33:40 -04:00
savage_drm.h
sis_drm.h
tegra_drm.h	drm/tegra: Deliver syncpoint base to user space	2013-10-31 09:55:48 +01:00
via_drm.h
vmwgfx_drm.h