• Daniel Vetter's avatar
    Merge tag 'v3.7-rc2' into drm-intel-next-queued · c2fb7916
    Daniel Vetter authored
    Linux 3.7-rc2
    
    Backmerge to solve two ugly conflicts:
    - uapi. We've already added new ioctl definitions for -next. Do I need to say more?
    - wc support gtt ptes. We've had to revert this for snb+ for 3.7 and
      also fix a few other things in the code. Now we know how to make it
      work on snb+, but to avoid losing the other fixes do the backmerge
      first before re-enabling wc gtt ptes on snb+.
    
    And a few other minor things, among them git getting confused in
    intel_dp.c and seemingly causing a conflict out of nothing ...
    
    Conflicts:
    	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_modes.c
    	include/drm/i915_drm.h
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    c2fb7916
intel_opregion.c 15.1 KB