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

Commit 75ea10da authored by Chris Wilson's avatar Chris Wilson Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Add runtime pm around fences 



Manipulating the fence_list requires the runtime wakelock, as does
writing to the fence registers. Acquire a wakelock for the former, and
assert that the device is awake for the latter.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 22681c7b

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

+10 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ void intel_vgpu_write_fence(struct intel_vgpu *vgpu, 
	struct drm_i915_fence_reg *reg;

	i915_reg_t fence_reg_lo, fence_reg_hi;



	assert_rpm_wakelock_held(dev_priv);



	if (WARN_ON(fence > vgpu_fence_sz(vgpu)))

		return;
@@ -173,6 +175,8 @@ static void free_vgpu_fence(struct intel_vgpu *vgpu) 
	if (WARN_ON(!vgpu_fence_sz(vgpu)))

		return;



	intel_runtime_pm_get(dev_priv);



	mutex_lock(&dev_priv->drm.struct_mutex);

	for (i = 0; i < vgpu_fence_sz(vgpu); i++) {

		reg = vgpu->fence.regs[i];
@@ -181,6 +185,8 @@ static void free_vgpu_fence(struct intel_vgpu *vgpu) 
			      &dev_priv->mm.fence_list);

	}

	mutex_unlock(&dev_priv->drm.struct_mutex);



	intel_runtime_pm_put(dev_priv);

}



static int alloc_vgpu_fence(struct intel_vgpu *vgpu)
@@ -191,6 +197,8 @@ static int alloc_vgpu_fence(struct intel_vgpu *vgpu) 
	int i;

	struct list_head *pos, *q;



	intel_runtime_pm_get(dev_priv);



	/* Request fences from host */

	mutex_lock(&dev_priv->drm.struct_mutex);

	i = 0;
@@ -208,6 +216,7 @@ static int alloc_vgpu_fence(struct intel_vgpu *vgpu) 
		goto out_free_fence;



	mutex_unlock(&dev_priv->drm.struct_mutex);

	intel_runtime_pm_put(dev_priv);

	return 0;

out_free_fence:

	/* Return fences to host, if fail */
@@ -219,6 +228,7 @@ static int alloc_vgpu_fence(struct intel_vgpu *vgpu) 
			      &dev_priv->mm.fence_list);

	}

	mutex_unlock(&dev_priv->drm.struct_mutex);

	intel_runtime_pm_put(dev_priv);

	return -ENOSPC;

}