diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-17 01:44:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-17 01:44:41 -0700 |
commit | fb09185a88cad9c59e22e84f8c0594303595e9af (patch) | |
tree | a7287193506fe491cff1ac84b72e1865906991d7 /lib/timerqueue.c | |
parent | 41a328b95c00fa00ed5832c2876aee7186222438 (diff) | |
parent | c4af5c4597a7a5d64e058703e1328f315a59794e (diff) | |
download | op-kernel-dev-fb09185a88cad9c59e22e84f8c0594303595e9af.zip op-kernel-dev-fb09185a88cad9c59e22e84f8c0594303595e9af.tar.gz |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Radeon is most of the work, one regression, one BUG fix in the new
prime code, some fixes to init code to make streamout not lock up the
hardware, and just some code to enable users to test HDMI audio on
later hw (its off by default).
Intel adds edp edid caching for some strange Dell Vostros that black
screen on startup if keep reading their EDID, and a fix for a DP
regression.
Otherwise fix for via/sis and one to stop udl binding to multiple
non-video usb."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: cache the EDID for eDP panels
Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
drm/i915: eDP aux needs vdd
drm/i915: don't enumerate HDMID if an eDP panel is already active on the port
drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx
drm/radeon: add some additional 6xx/7xx/EG register init
drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
drm sis: initialize object_idr
drm via: initialize object_idr
drm/radeon/prime: reserve/unreserve around pin
drm/radeon: fix regression in dynpm due to multi-ring rework
vga_switcheroo.h: fix pci_dev warning
drm/udl: only bind to the video devices on the hub.
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions