Commit 87b391b9 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915: Remove rpm asserts that use i915 



Quite a few of the call points have already switched to the version
working directly on the runtime_pm structure, so let's switch over the
rest and kill the i915-based asserts.

v2: rebase

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190613232156.34940-3-daniele.ceraolospurio@intel.com
parent d5b6c275

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) 
		goto err_fence;



	/* Mark as being mmapped into userspace for later revocation */

	assert_rpm_wakelock_held(i915);

	assert_rpm_wakelock_held(&i915->runtime_pm);

	if (!i915_vma_set_userfault(vma) && !obj->userfault_count++)

		list_add(&obj->userfault_link, &i915->ggtt.userfault_list);

	if (CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)

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

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void intel_vgpu_write_fence(struct intel_vgpu *vgpu, 
	struct i915_fence_reg *reg;

	i915_reg_t fence_reg_lo, fence_reg_hi;



	assert_rpm_wakelock_held(dev_priv);

	assert_rpm_wakelock_held(&dev_priv->runtime_pm);



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

		return;

drivers/gpu/drm/i915/i915_gem_fence_reg.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ int i915_vma_pin_fence(struct i915_vma *vma) 
	 * Note that we revoke fences on runtime suspend. Therefore the user

	 * must keep the device awake whilst using the fence.

	 */

	assert_rpm_wakelock_held(vma->vm->i915);

	assert_rpm_wakelock_held(&vma->vm->i915->runtime_pm);



	/* Just update our place in the LRU if our fence is getting reused. */

	if (vma->fence) {

drivers/gpu/drm/i915/i915_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv) 


void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv)

{

	assert_rpm_wakelock_held(dev_priv);

	assert_rpm_wakelock_held(&dev_priv->runtime_pm);



	spin_lock_irq(&dev_priv->irq_lock);

	gen6_reset_pm_iir(dev_priv, dev_priv->pm_guc_events);
@@ -598,7 +598,7 @@ void gen9_reset_guc_interrupts(struct drm_i915_private *dev_priv) 


void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv)

{

	assert_rpm_wakelock_held(dev_priv);

	assert_rpm_wakelock_held(&dev_priv->runtime_pm);



	spin_lock_irq(&dev_priv->irq_lock);

	if (!dev_priv->guc.interrupts.enabled) {
@@ -612,7 +612,7 @@ void gen9_enable_guc_interrupts(struct drm_i915_private *dev_priv) 


void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv)

{

	assert_rpm_wakelock_held(dev_priv);

	assert_rpm_wakelock_held(&dev_priv->runtime_pm);



	spin_lock_irq(&dev_priv->irq_lock);

	dev_priv->guc.interrupts.enabled = false;

drivers/gpu/drm/i915/i915_vma.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) 
	int err;



	/* Access through the GTT requires the device to be awake. */

	assert_rpm_wakelock_held(vma->vm->i915);

	assert_rpm_wakelock_held(&vma->vm->i915->runtime_pm);



	lockdep_assert_held(&vma->vm->i915->drm.struct_mutex);

	if (WARN_ON(!i915_vma_is_map_and_fenceable(vma))) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE