mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-26 12:34:41 +08:00
91915260ea
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 |
||
|---|---|---|
| .. | ||
| core | ||
| dispnv04 | ||
| Kconfig | ||
| Makefile | ||
| nouveau_abi16.c | ||
| nouveau_abi16.h | ||
| nouveau_acpi.c | ||
| nouveau_acpi.h | ||
| nouveau_agp.c | ||
| nouveau_agp.h | ||
| nouveau_backlight.c | ||
| nouveau_bios.c | ||
| nouveau_bios.h | ||
| nouveau_bo.c | ||
| nouveau_bo.h | ||
| nouveau_chan.c | ||
| nouveau_chan.h | ||
| nouveau_connector.c | ||
| nouveau_connector.h | ||
| nouveau_crtc.h | ||
| nouveau_debugfs.c | ||
| nouveau_debugfs.h | ||
| nouveau_display.c | ||
| nouveau_display.h | ||
| nouveau_dma.c | ||
| nouveau_dma.h | ||
| nouveau_dp.c | ||
| nouveau_drm.c | ||
| nouveau_drm.h | ||
| nouveau_encoder.h | ||
| nouveau_fbcon.c | ||
| nouveau_fbcon.h | ||
| nouveau_fence.c | ||
| nouveau_fence.h | ||
| nouveau_gem.c | ||
| nouveau_gem.h | ||
| nouveau_hwmon.c | ||
| nouveau_hwmon.h | ||
| nouveau_ioc32.c | ||
| nouveau_ioctl.h | ||
| nouveau_prime.c | ||
| nouveau_reg.h | ||
| nouveau_sgdma.c | ||
| nouveau_sysfs.c | ||
| nouveau_sysfs.h | ||
| nouveau_ttm.c | ||
| nouveau_ttm.h | ||
| nouveau_vga.c | ||
| nouveau_vga.h | ||
| nv04_fbcon.c | ||
| nv04_fence.c | ||
| nv10_fence.c | ||
| nv10_fence.h | ||
| nv17_fence.c | ||
| nv50_display.c | ||
| nv50_display.h | ||
| nv50_fbcon.c | ||
| nv50_fence.c | ||
| nv84_fence.c | ||
| nvc0_fbcon.c | ||
| nvc0_fence.c | ||