From: Zhenyu Wang Date: Thu, 7 Jun 2018 02:24:50 +0000 (+0800) Subject: Merge tag 'drm-intel-next-2018-06-06' into gvt-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0766e2efc6968179ceec9828caf740ec0ac58a15;p=linux.git 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 --- 0766e2efc6968179ceec9828caf740ec0ac58a15 diff --cc drivers/gpu/drm/i915/gvt/scheduler.c index 847f295e6755b,7f5e01df95eee..cf5a22cb6e06e --- a/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.