Merge tag 'drm-intel-next-2018-06-06' into gvt-next

Backmerge for recent request->hw_context change and
new vGPU huge page capability definition.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

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

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

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

diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
index 847f295e6755be1c11d5a1f63067d2e13735bd4f,7f5e01df95eee71786b8c1a65c894f27815de6a6..cf5a22cb6e06e1c878ffea581580341b876aba60
--- 1/drivers/gpu/drm/i915/gvt/scheduler.c
--- 2/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@@ -860,10 -804,10 +806,11 @@@ static void complete_current_workload(s
                scheduler->current_workload[ring_id];
        struct intel_vgpu *vgpu = workload->vgpu;
        struct intel_vgpu_submission *s = &vgpu->submission;
+       struct i915_request *rq = workload->req;
        int event;
  
 -      mutex_lock(&gvt->lock);
 +      mutex_lock(&vgpu->vgpu_lock);
 +      mutex_lock(&gvt->sched_lock);
  
        /* For the workload w/ request, needs to wait for the context
         * switch to make sure request is completed.

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