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

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

drm/i915: update with_intel_runtime_pm to use the rpm structure 



Matching the underlying get/put functions.

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-8-daniele.ceraolospurio@intel.com
parent d858d569

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

+4 −4
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ unsigned long i915_gem_shrink_all(struct drm_i915_private *i915) 
	intel_wakeref_t wakeref;

	unsigned long freed = 0;



	with_intel_runtime_pm(i915, wakeref) {

	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {

		freed = i915_gem_shrink(i915, -1UL, NULL,

					I915_SHRINK_BOUND |

					I915_SHRINK_UNBOUND |
@@ -358,7 +358,7 @@ i915_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) 
	if (sc->nr_scanned < sc->nr_to_scan && current_is_kswapd()) {

		intel_wakeref_t wakeref;



		with_intel_runtime_pm(i915, wakeref) {

		with_intel_runtime_pm(&i915->runtime_pm, wakeref) {

			freed += i915_gem_shrink(i915,

						 sc->nr_to_scan - sc->nr_scanned,

						 &sc->nr_scanned,
@@ -385,7 +385,7 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) 
	unsigned long flags;



	freed_pages = 0;

	with_intel_runtime_pm(i915, wakeref)

	with_intel_runtime_pm(&i915->runtime_pm, wakeref)

		freed_pages += i915_gem_shrink(i915, -1UL, NULL,

					       I915_SHRINK_BOUND |

					       I915_SHRINK_UNBOUND |
@@ -433,7 +433,7 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr 
				   MAX_SCHEDULE_TIMEOUT))

		goto out;



	with_intel_runtime_pm(i915, wakeref)

	with_intel_runtime_pm(&i915->runtime_pm, wakeref)

		freed_pages += i915_gem_shrink(i915, -1UL, NULL,

					       I915_SHRINK_BOUND |

					       I915_SHRINK_UNBOUND |

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

+3 −3
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int igt_ctx_exec(void *arg) 
				}

			}



			with_intel_runtime_pm(i915, wakeref)

			with_intel_runtime_pm(&i915->runtime_pm, wakeref)

				err = gpu_fill(obj, ctx, engine, dw);

			if (err) {

				pr_err("Failed to fill dword %lu [%lu/%lu] with gpu (%s) in ctx %u [full-ppgtt? %s], err=%d\n",
@@ -647,7 +647,7 @@ static int igt_shared_ctx_exec(void *arg) 
			}



			err = 0;

			with_intel_runtime_pm(i915, wakeref)

			with_intel_runtime_pm(&i915->runtime_pm, wakeref)

				err = gpu_fill(obj, ctx, engine, dw);

			if (err) {

				pr_err("Failed to fill dword %lu [%lu/%lu] with gpu (%s) in ctx %u [full-ppgtt? %s], err=%d\n",
@@ -1230,7 +1230,7 @@ static int igt_ctx_readonly(void *arg) 
			}



			err = 0;

			with_intel_runtime_pm(i915, wakeref)

			with_intel_runtime_pm(&i915->runtime_pm, wakeref)

				err = gpu_fill(obj, ctx, engine, dw);

			if (err) {

				pr_err("Failed to fill dword %lu [%lu/%lu] with gpu (%s) in ctx %u [full-ppgtt? %s], err=%d\n",

drivers/gpu/drm/i915/gt/intel_context.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int __intel_context_do_pin(struct intel_context *ce) 
		intel_wakeref_t wakeref;



		err = 0;

		with_intel_runtime_pm(ce->engine->i915, wakeref)

		with_intel_runtime_pm(&ce->engine->i915->runtime_pm, wakeref)

			err = ce->ops->pin(ce);

		if (err)

			goto err;

drivers/gpu/drm/i915/gt/intel_reset.c

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ void i915_gem_set_wedged(struct drm_i915_private *i915) 
	intel_wakeref_t wakeref;



	mutex_lock(&error->wedge_mutex);

	with_intel_runtime_pm(i915, wakeref)

	with_intel_runtime_pm(&i915->runtime_pm, wakeref)

		__i915_gem_set_wedged(i915);

	mutex_unlock(&error->wedge_mutex);

}

drivers/gpu/drm/i915/gt/selftest_reset.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int intel_reset_live_selftests(struct drm_i915_private *i915) 
	if (i915_terminally_wedged(i915))

		return -EIO; /* we're long past hope of a successful reset */



	with_intel_runtime_pm(i915, wakeref)

	with_intel_runtime_pm(&i915->runtime_pm, wakeref)

		err = i915_subtests(tests, i915);



	return err;