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

Commit 1197b4f2 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915: Balance context pinning on reset cleanup 



We pin when we submit to execlist queue. Balance
the pinning when the submitted queue is cleaned on reset.

Cc: Dave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarThomas Daniel <thomas.daniel@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 08e16dc8

drivers/gpu/drm/i915/i915_gem.c

+4 −0
Original line number Diff line number Diff line
@@ -2656,6 +2656,10 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv, 
				execlist_link);

		list_del(&submit_req->execlist_link);

		intel_runtime_pm_put(dev_priv);



		if (submit_req->ctx != ring->default_context)

			intel_lr_context_unpin(ring, submit_req->ctx);



		i915_gem_context_unreference(submit_req->ctx);

		kfree(submit_req);

	}

drivers/gpu/drm/i915/intel_lrc.c

+1 −0
Original line number Diff line number Diff line
@@ -1751,6 +1751,7 @@ void intel_lr_context_free(struct intel_context *ctx) 
				intel_unpin_ringbuffer_obj(ringbuf);

				i915_gem_object_ggtt_unpin(ctx_obj);

			}

			WARN_ON(ctx->engine[ring->id].unpin_count);

			intel_destroy_ringbuffer_obj(ringbuf);

			kfree(ringbuf);

			drm_gem_object_unreference(&ctx_obj->base);