mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +00:00
fffddfd6c8
Pull drm merge from Dave Airlie:
"Highlights:
- TI LCD controller KMS driver
- TI OMAP KMS driver merged from staging
- drop gma500 stub driver
- the fbcon locking fixes
- the vgacon dirty like zebra fix.
- open firmware videomode and hdmi common code helpers
- major locking rework for kms object handling - pageflip/cursor
won't block on polling anymore!
- fbcon helper and prime helper cleanups
- i915: all over the map, haswell power well enhancements, valleyview
macro horrors cleaned up, killing lots of legacy GTT code,
- radeon: CS ioctl unification, deprecated UMS support, gpu reset
rework, VM fixes
- nouveau: reworked thermal code, external dp/tmds encoder support
(anx9805), fences sleep instead of polling,
- exynos: all over the driver fixes."
Lovely conflict in radeon/evergreen_cs.c between commit
|
||
---|---|---|
.. | ||
cirrus_drv.c | ||
cirrus_drv.h | ||
cirrus_fbdev.c | ||
cirrus_main.c | ||
cirrus_mode.c | ||
cirrus_ttm.c | ||
Kconfig | ||
Makefile |