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

Commit 1c71bc56 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Chris Wilson
Browse files

drm/i915/perf: simplify configure all context function 



We don't need any special treatment on error so just return as soon as
possible.

Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180813080218.28994-2-tvrtko.ursulin@linux.intel.com
parent a64f8887

drivers/gpu/drm/i915/i915_perf.c

+4 −7
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv, 
	/* Switch away from any user context. */

	ret = gen8_switch_to_updated_kernel_context(dev_priv, oa_config);

	if (ret)

		goto out;

		return ret;



	/*

	 * The OA register config is setup through the context image. This image
@@ -1838,7 +1838,7 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv, 
				     wait_flags,

				     MAX_SCHEDULE_TIMEOUT);

	if (ret)

		goto out;

		return ret;



	/* Update all contexts now that we've stalled the submission. */

	list_for_each_entry(ctx, &dev_priv->contexts.list, link) {
@@ -1850,10 +1850,8 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv, 
			continue;



		regs = i915_gem_object_pin_map(ce->state->obj, I915_MAP_WB);

		if (IS_ERR(regs)) {

			ret = PTR_ERR(regs);

			goto out;

		}

		if (IS_ERR(regs))

			return PTR_ERR(regs);



		ce->state->obj->mm.dirty = true;

		regs += LRC_STATE_PN * PAGE_SIZE / sizeof(*regs);
@@ -1863,7 +1861,6 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv, 
		i915_gem_object_unpin_map(ce->state->obj);

	}



 out:

	return ret;

}