Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Daniel writes: Bigger -fixes pile, mostly because I've included Ajax' DP dongle stuff, as discussed on irc. Otherwise just small things: - regression fix to finally make 6bpc auto-dither on dp work (Jani) - reinstate an snb ctx w/a that accidentally got lost in a rework (Chris) - fixup the DP train sequence, logic-goof-up uncovered by Coverty (Chris) - fix set_caching locking (Ben) - fix spurious segfault on con-current gtt mmap faulting (Dimitry and Mika) - some pageflip correctness fixes (still hunting down some issues, but these are the worst offenders of confused code that we've tracked down thus far) from Chris and me - fixup swizzling settings on vlv (Jesse) - gt_mode w/a from Ben added, fixes snb gt1 rc6+hw ctx hangs. * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: Fix GT_MODE default value drm/i915: don't frob the vblank ts in finish_page_flip drm/i915: call drm_handle_vblank before finish_page_flip drm/i915: print warning if vmi915_gem_fault error is not handled drm/i915: EBUSY status handling added to i915_gem_fault(). drm/i915: Try harder to complete DP training pattern 1 drm/i915: set swizzling to none on VLV drm/dp: Make sink count DP 1.2 aware drm/dp: Document DP spec versions for various DPCD registers drm/i915/dp: Be smarter about connection sense for branch devices drm/i915/dp: Fetch downstream port info if needed during DPCD fetch drm/dp: Update DPCD defines drm: Export drm_probe_ddc() drm/i915: Flush the pending flips on the CRTC before modification drm/i915: Actually invalidate the TLB for the SandyBridge HW contexts w/a drm/i915: Fix set_caching locking drm/i915: use adjusted_mode instead of mode for checking the 6bpc force flag
No related branches found
No related tags found
Showing
- drivers/gpu/drm/drm_edid.c 2 additions, 1 deletiondrivers/gpu/drm/drm_edid.c
- drivers/gpu/drm/i915/i915_gem.c 10 additions, 4 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_gem_context.c 1 addition, 1 deletiondrivers/gpu/drm/i915/i915_gem_context.c
- drivers/gpu/drm/i915/i915_gem_tiling.c 4 additions, 1 deletiondrivers/gpu/drm/i915/i915_gem_tiling.c
- drivers/gpu/drm/i915/i915_irq.c 8 additions, 8 deletionsdrivers/gpu/drm/i915/i915_irq.c
- drivers/gpu/drm/i915/i915_reg.h 3 additions, 0 deletionsdrivers/gpu/drm/i915/i915_reg.h
- drivers/gpu/drm/i915/intel_display.c 26 additions, 26 deletionsdrivers/gpu/drm/i915/intel_display.c
- drivers/gpu/drm/i915/intel_dp.c 57 additions, 16 deletionsdrivers/gpu/drm/i915/intel_dp.c
- drivers/gpu/drm/i915/intel_drv.h 2 additions, 0 deletionsdrivers/gpu/drm/i915/intel_drv.h
- drivers/gpu/drm/i915/intel_pm.c 5 additions, 0 deletionsdrivers/gpu/drm/i915/intel_pm.c
- include/drm/drm_crtc.h 1 addition, 0 deletionsinclude/drm/drm_crtc.h
- include/drm/drm_dp_helper.h 83 additions, 18 deletionsinclude/drm/drm_dp_helper.h
Loading
Please register or sign in to comment