Merge tag 'v3.12' into drm-intel-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 Nov 2013 15:28:47 +0000 (16:28 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 Nov 2013 15:28:52 +0000 (16:28 +0100)
commit7f16e5c1416070dc590dd333a2d677700046a4ab
tree55718bbef64431e70d5ed282be516cd45b3f75e6
parent9d1cb9147dbe45f6e94dc796518ecf67cb64b359
parent5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52
Merge tag 'v3.12' into drm-intel-next

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>
13 files changed:
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/radeon/radeon_drv.c
include/uapi/drm/drm_mode.h