Merge tag 'gvt-next-2020-03-10' of https://github.com/intel/gvt-linux into drm-intel...

gvt-next-2020-03-10

- Fix CFL dmabuf display after vfio edid enabling (Tina)
- Clean up scan non-priv batch debugfs entry (Chris)
- Use intel engines initialized in gvt, cleanup previous ring id (Chris)
- Use intel_gt instead (Chris)

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310081928.GG28483@zhen-hp.sh.intel.com

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

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

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

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