]> 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)
commit1b21ac288d5e57b35924010d41682c144679f8ae
tree107c48a9d0782279fde07b6fda44994b96b9ac36
parent7757ee4a7823b3389f3592b2d8ce6d20d97fe6af
parent96e37b571ba2afff9dcf9624ce6a9f3a7b01dc7f
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Chris Wilson wants the new fence tracepoint added in

commit 87be7497af7625fc4983bc45422fa2f394e3c117
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