• Daniel Vetter's avatar
    Merge tag 'v3.12' into drm-intel-next · 7f16e5c1
    Daniel Vetter authored
    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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    7f16e5c1
drm_mode.h 13.2 KB