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

Commit 070c1d05 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Drop redundant GGTT rebinding 



Since

commit bf3d149b
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Feb 14 14:01:12 2014 +0100

    drm/i915: split PIN_GLOBAL out from PIN_MAPPABLE

i915_gem_obj_ggtt_pin always binds into the ggtt, but I've forgotten
to remove the now redundant additional bind call later on. Fix this
up.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 0229da32

drivers/gpu/drm/i915/i915_gem_context.c

+0 −11
Original line number Diff line number Diff line
@@ -638,7 +638,6 @@ static int do_switch(struct intel_engine_cs *ring, 
	struct intel_context *from = ring->last_context;

	u32 hw_flags = 0;

	bool uninitialized = false;

	struct i915_vma *vma;

	int ret, i;



	if (from != NULL && ring == &dev_priv->ring[RCS]) {
@@ -696,16 +695,6 @@ static int do_switch(struct intel_engine_cs *ring, 
	if (ret)

		goto unpin_out;



	vma = i915_gem_obj_to_ggtt(to->legacy_hw_ctx.rcs_state);

	if (!(vma->bound & GLOBAL_BIND)) {

		ret = i915_vma_bind(vma,

				    to->legacy_hw_ctx.rcs_state->cache_level,

				    GLOBAL_BIND);

		/* This shouldn't ever fail. */

		if (WARN_ONCE(ret, "GGTT context bind failed!"))

			goto unpin_out;

	}



	if (!to->legacy_hw_ctx.initialized) {

		hw_flags |= MI_RESTORE_INHIBIT;

		/* NB: If we inhibit the restore, the context is not allowed to