]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6deab58d118410ab0fd6bae56712da0ae99bc5e5
tree107c48a9d0782279fde07b6fda44994b96b9ac36
parentca2d771c040795faddf978f26372c545e586bc59
parent060ea2da6dea2e6ba30a569c084e550b27145fcc
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Chris Wilson wants the new fence tracepoint added in

commit 36c61d03ea459967ba471a9b70b3f9afa567f63d
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