]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge drm-next into drm-intel-next-queued (this time for real)
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Thu, 1 Mar 2018 09:14:24 +0000 (11:14 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Thu, 1 Mar 2018 09:14:24 +0000 (11:14 +0200)
commitbba73071b6f71be0a101658d7c13866e30b264a6
tree2a0ea1fc5fd975f1c2e9e50de5bb3cb2cb3cb5f7
parentc71b53cc66c5053ff3524a6132f8fc8199d618c3
parentf073d78eeb8efd85718e611c15f9a78647751dea
Merge drm-next into drm-intel-next-queued (this time for real)

To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Documentation/gpu/todo.rst
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/gvt/scheduler.c
drivers/gpu/drm/i915/gvt/scheduler.h
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_perf.c
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_drv.h
drivers/gpu/drm/i915/intel_fbc.c