mirror of https://github.com/torvalds/linux.git
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
|
||
|---|---|---|
| .. | ||
| Kbuild | ||
| atmel_lcdc.h | ||
| aty128.h | ||
| auo_k190xfb.h | ||
| broadsheetfb.h | ||
| cirrus.h | ||
| cvisionppc.h | ||
| da8xx-fb.h | ||
| display_timing.h | ||
| edid.h | ||
| exynos_dp.h | ||
| exynos_mipi_dsim.h | ||
| gbe.h | ||
| hecubafb.h | ||
| iga.h | ||
| ili9320.h | ||
| kyro.h | ||
| mach64.h | ||
| maxinefb.h | ||
| mbxfb.h | ||
| metronomefb.h | ||
| mipi_display.h | ||
| mmp_disp.h | ||
| neomagic.h | ||
| newport.h | ||
| of_display_timing.h | ||
| of_videomode.h | ||
| omap-panel-generic-dpi.h | ||
| omap-panel-n8x0.h | ||
| omap-panel-nokia-dsi.h | ||
| omap-panel-picodlp.h | ||
| omap-panel-tfp410.h | ||
| omapdss.h | ||
| omapvrfb.h | ||
| permedia2.h | ||
| platform_lcd.h | ||
| pm3fb.h | ||
| pmag-ba-fb.h | ||
| pmagb-b-fb.h | ||
| pxa168fb.h | ||
| radeon.h | ||
| s1d13xxxfb.h | ||
| sa1100fb.h | ||
| samsung_fimd.h | ||
| sgivw.h | ||
| sh_mipi_dsi.h | ||
| sh_mobile_hdmi.h | ||
| sh_mobile_lcdc.h | ||
| sh_mobile_meram.h | ||
| sisfb.h | ||
| sstfb.h | ||
| tdfx.h | ||
| tgafb.h | ||
| trident.h | ||
| udlfb.h | ||
| uvesafb.h | ||
| vga.h | ||
| videomode.h | ||
| w100fb.h | ||