mirror of
https://github.com/torvalds/linux
synced 2024-09-30 08:20:40 +00:00
612a9aab56
Pull drm merge (part 1) from Dave Airlie:
"So first of all my tree and uapi stuff has a conflict mess, its my
fault as the nouveau stuff didn't hit -next as were trying to rebase
regressions out of it before we merged.
Highlights:
- SH mobile modesetting driver and associated helpers
- some DRM core documentation
- i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
combined pte writing, ilk rc6 support,
- nouveau: major driver rework into a hw core driver, makes features
like SLI a lot saner to implement,
- psb: add eDP/DP support for Cedarview
- radeon: 2 layer page tables, async VM pte updates, better PLL
selection for > 2 screens, better ACPI interactions
The rest is general grab bag of fixes.
So why part 1? well I have the exynos pull req which came in a bit
late but was waiting for me to do something they shouldn't have and it
looks fairly safe, and David Howells has some more header cleanups
he'd like me to pull, that seem like a good idea, but I'd like to get
this merge out of the way so -next dosen't get blocked."
Tons of conflicts mostly due to silly include line changes, but mostly
mindless. A few other small semantic conflicts too, noted from Dave's
pre-merged branch.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
drm/nv98/crypt: fix fuc build with latest envyas
drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
drm/nv41/vm: fix and enable use of "real" pciegart
drm/nv44/vm: fix and enable use of "real" pciegart
drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
drm/nouveau: store supported dma mask in vmmgr
drm/nvc0/ibus: initial implementation of subdev
drm/nouveau/therm: add support for fan-control modes
drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
drm/nouveau/therm: calculate the pwm divisor on nv50+
drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
drm/nouveau/therm: move thermal-related functions to the therm subdev
drm/nouveau/bios: parse the pwm divisor from the perf table
drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
drm/nouveau/therm: rework thermal table parsing
drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
drm/nouveau: fix pm initialization order
drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
drm/nouveau: log channel debug/error messages from client object rather than drm client
drm/nouveau: have drm debugging macros build on top of core macros
...
|
||
|---|---|---|
| .. | ||
| accel_2d.c | ||
| backlight.c | ||
| cdv_device.c | ||
| cdv_device.h | ||
| cdv_intel_crt.c | ||
| cdv_intel_display.c | ||
| cdv_intel_dp.c | ||
| cdv_intel_hdmi.c | ||
| cdv_intel_lvds.c | ||
| framebuffer.c | ||
| framebuffer.h | ||
| gem.c | ||
| gtt.c | ||
| gtt.h | ||
| intel_bios.c | ||
| intel_bios.h | ||
| intel_gmbus.c | ||
| intel_i2c.c | ||
| Kconfig | ||
| Makefile | ||
| mdfld_device.c | ||
| mdfld_dsi_dpi.c | ||
| mdfld_dsi_dpi.h | ||
| mdfld_dsi_output.c | ||
| mdfld_dsi_output.h | ||
| mdfld_dsi_pkg_sender.c | ||
| mdfld_dsi_pkg_sender.h | ||
| mdfld_intel_display.c | ||
| mdfld_output.c | ||
| mdfld_output.h | ||
| mdfld_tmd_vid.c | ||
| mdfld_tpo_vid.c | ||
| mid_bios.c | ||
| mid_bios.h | ||
| mmu.c | ||
| oaktrail.h | ||
| oaktrail_crtc.c | ||
| oaktrail_device.c | ||
| oaktrail_hdmi.c | ||
| oaktrail_hdmi_i2c.c | ||
| oaktrail_lvds.c | ||
| opregion.c | ||
| opregion.h | ||
| power.c | ||
| power.h | ||
| psb_device.c | ||
| psb_drv.c | ||
| psb_drv.h | ||
| psb_intel_display.c | ||
| psb_intel_display.h | ||
| psb_intel_drv.h | ||
| psb_intel_lvds.c | ||
| psb_intel_modes.c | ||
| psb_intel_reg.h | ||
| psb_intel_sdvo.c | ||
| psb_intel_sdvo_regs.h | ||
| psb_irq.c | ||
| psb_irq.h | ||
| psb_lid.c | ||
| psb_reg.h | ||
| tc35876x-dsi-lvds.c | ||
| tc35876x-dsi-lvds.h | ||