Merge tag 'gvt-fixes-2017-06-29' of https://github.com/01org/gvt-linux into drm-intel...

gvt-fixes-2017-06-29

- two race fixes for VFIO locks from Chuanxiao
- virtual display fix for BDW from Xiong

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170629065424.kxopjbvntuakbyz2@zhen-hp.sh.intel.com

diff --cc drivers/gpu/drm/i915/gvt/gvt.h
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/handlers.c
Simple merge