Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2b599fb authored by Hang Yuan's avatar Hang Yuan Committed by Zhenyu Wang
Browse files

drm/i915/gvt: move intel_runtime_pm_get out of spin_lock in stop_schedule 



pm_runtime_get_sync in intel_runtime_pm_get might sleep if i915
device is not active. When stop vgpu schedule, the device may be
inactive. So need to move runtime_pm_get out of spin_lock/unlock.

Fixes: b24881e0("drm/i915/gvt: Add runtime_pm_get/put into gvt_switch_mmio
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHang Yuan <hang.yuan@linux.intel.com>
Signed-off-by: default avatarXiong Zhang <xiong.y.zhang@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent b9b824a5

drivers/gpu/drm/i915/gvt/mmio_context.c

+0 −2
Original line number Diff line number Diff line
@@ -562,11 +562,9 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre, 
	 * performace for batch mmio read/write, so we need

	 * handle forcewake mannually.

	 */

	intel_runtime_pm_get(dev_priv);

	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);

	switch_mmio(pre, next, ring_id);

	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);

	intel_runtime_pm_put(dev_priv);

}



/**

drivers/gpu/drm/i915/gvt/sched_policy.c

+3 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ void intel_vgpu_stop_schedule(struct intel_vgpu *vgpu) 
		&vgpu->gvt->scheduler;

	int ring_id;

	struct vgpu_sched_data *vgpu_data = vgpu->sched_data;

	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;



	if (!vgpu_data->active)

		return;
@@ -444,6 +445,7 @@ void intel_vgpu_stop_schedule(struct intel_vgpu *vgpu) 
		scheduler->current_vgpu = NULL;

	}



	intel_runtime_pm_get(dev_priv);

	spin_lock_bh(&scheduler->mmio_context_lock);

	for (ring_id = 0; ring_id < I915_NUM_ENGINES; ring_id++) {

		if (scheduler->engine_owner[ring_id] == vgpu) {
@@ -452,5 +454,6 @@ void intel_vgpu_stop_schedule(struct intel_vgpu *vgpu) 
		}

	}

	spin_unlock_bh(&scheduler->mmio_context_lock);

	intel_runtime_pm_put(dev_priv);

	mutex_unlock(&vgpu->gvt->sched_lock);

}