Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Wed, 2 May 2018 09:20:32 +0000 (12:20 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 2 May 2018 09:20:32 +0000 (12:20 +0300)
commit53f071e19d566e7d0a4eada1bd8313a4cdb660a4
treeee2aecae90ec29ab404cf60bedeb3feb2ec99966
parent043477b088d2af61a0937754c6560002237e6741
parent0ab390262c4920f26f8202063a268d5fc829728e
Merge drm/drm-next into drm-intel-next-queued

Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/i915/gvt/cmd_parser.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fbdev.c
drivers/gpu/drm/i915/intel_lrc.c