7f16e5c141
I want to merge in the new Broadwell support as a late hw enabling pull request. But since the internal branch was based upon our drm-intel-nightly integration branch I need to resolve all the oustanding conflicts in drm/i915 with a backmerge to make the 60+ patches apply properly. We'll propably have some fun because Linus will come up with a slightly different merge solution. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_crt.c drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_drv.h All rather simple adjacent lines changed or partial backports from -next to -fixes, with the exception of the thaw code in i915_dma.c. That one needed a bit of shuffling to restore the intent. Oh and the massive header file reordering in intel_drv.h is a bit trouble. But not much. v2: Also don't forget the fixup for the silent conflict that results in compile fail ... Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
||
---|---|---|
.. | ||
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 | ||
gma_display.c | ||
gma_display.h | ||
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_device.h | ||
psb_drv.c | ||
psb_drv.h | ||
psb_intel_display.c | ||
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 |