Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 1 Feb 2017 09:58:11 +0000 (10:58 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 1 Feb 2017 09:58:11 +0000 (10:58 +0100)
commite2b06d71bd3f50ac7098b3f2492ea95470b713db
tree107c48a9d0782279fde07b6fda44994b96b9ac36
parent1692cd60d999b00a0491692dab0286e6011abd36
parent18566acac18f5784347bc5fe636a26897d1c963b
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Chris Wilson wants the new fence tracepoint added in

commit 8c96c678011eeb1676da18f203e90dea7e0d69d2
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Jan 24 11:57:58 2017 +0000

    dma/fence: Export enable-signaling tracepoint for emission by drivers

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_dp_mst.c