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

drm/i915: update rpm_get/put to use the rpm structure 



The functions where internally already only using the structure, so we
need to just flip the interface.

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-7-daniele.ceraolospurio@intel.com
parent 69c66355

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

+6 −5
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) 
	struct drm_i915_gem_object *obj = to_intel_bo(area->vm_private_data);

	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *i915 = to_i915(dev);

	struct intel_runtime_pm *rpm = &i915->runtime_pm;

	struct i915_ggtt *ggtt = &i915->ggtt;

	bool write = area->vm_flags & VM_WRITE;

	intel_wakeref_t wakeref;
@@ -243,7 +244,7 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) 
	if (ret)

		goto err;



	wakeref = intel_runtime_pm_get(i915);

	wakeref = intel_runtime_pm_get(rpm);



	srcu = i915_reset_trylock(i915);

	if (srcu < 0) {
@@ -308,7 +309,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->runtime_pm);

	assert_rpm_wakelock_held(rpm);

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

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

	if (CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)
@@ -327,7 +328,7 @@ err_unlock: 
err_reset:

	i915_reset_unlock(i915, srcu);

err_rpm:

	intel_runtime_pm_put(i915, wakeref);

	intel_runtime_pm_put(rpm, wakeref);

	i915_gem_object_unpin_pages(obj);

err:

	switch (ret) {
@@ -410,7 +411,7 @@ void i915_gem_object_release_mmap(struct drm_i915_gem_object *obj) 
	 * wakeref.

	 */

	lockdep_assert_held(&i915->drm.struct_mutex);

	wakeref = intel_runtime_pm_get(i915);

	wakeref = intel_runtime_pm_get(&i915->runtime_pm);



	if (!obj->userfault_count)

		goto out;
@@ -427,7 +428,7 @@ void i915_gem_object_release_mmap(struct drm_i915_gem_object *obj) 
	wmb();



out:

	intel_runtime_pm_put(i915, wakeref);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

}



static int create_mmap_offset(struct drm_i915_gem_object *obj)

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

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915, 
	struct drm_i915_gem_object *obj, *on;

	intel_wakeref_t wakeref;



	wakeref = intel_runtime_pm_get(i915);

	wakeref = intel_runtime_pm_get(&i915->runtime_pm);

	llist_for_each_entry_safe(obj, on, freed, freed) {

		struct i915_vma *vma, *vn;
@@ -243,7 +243,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915, 


		cond_resched();

	}

	intel_runtime_pm_put(i915, wakeref);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

}



void i915_gem_flush_free_objects(struct drm_i915_private *i915)

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

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ i915_gem_shrink(struct drm_i915_private *i915, 
	 * we will force the wake during oom-notifier.

	 */

	if (shrink & I915_SHRINK_BOUND) {

		wakeref = intel_runtime_pm_get_if_in_use(i915);

		wakeref = intel_runtime_pm_get_if_in_use(&i915->runtime_pm);

		if (!wakeref)

			shrink &= ~I915_SHRINK_BOUND;

	}
@@ -267,7 +267,7 @@ i915_gem_shrink(struct drm_i915_private *i915, 
	}



	if (shrink & I915_SHRINK_BOUND)

		intel_runtime_pm_put(i915, wakeref);

		intel_runtime_pm_put(&i915->runtime_pm, wakeref);



	i915_retire_requests(i915);

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+2 −2
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *dev_priv) 
		return PTR_ERR(file);



	mutex_lock(&dev_priv->drm.struct_mutex);

	wakeref = intel_runtime_pm_get(dev_priv);

	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);



	ctx = live_context(dev_priv, file);

	if (IS_ERR(ctx)) {
@@ -1768,7 +1768,7 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *dev_priv) 
	err = i915_subtests(tests, ctx);



out_unlock:

	intel_runtime_pm_put(dev_priv, wakeref);

	intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);

	mutex_unlock(&dev_priv->drm.struct_mutex);



	mock_file_free(dev_priv, file);

drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int igt_gem_coherency(void *arg) 
	values = offsets + ncachelines;



	mutex_lock(&i915->drm.struct_mutex);

	wakeref = intel_runtime_pm_get(i915);

	wakeref = intel_runtime_pm_get(&i915->runtime_pm);

	for (over = igt_coherency_mode; over->name; over++) {

		if (!over->set)

			continue;
@@ -371,7 +371,7 @@ static int igt_gem_coherency(void *arg) 
		}

	}

unlock:

	intel_runtime_pm_put(i915, wakeref);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

	mutex_unlock(&i915->drm.struct_mutex);

	kfree(offsets);

	return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE