Commit ebf3c361 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/i915: Don't pin the object pages during pending vma binds 



A pin-count is already held by vma->pages so taking an additional pin
during async binds is not necessary.

When we introduce async unbinding we have other means of keeping the
object pages alive.

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220110172219.107131-4-thomas.hellstrom@linux.intel.com
parent 39a2bd34

drivers/gpu/drm/i915/i915_vma.c

+1 −4
Original line number Diff line number Diff line
@@ -305,10 +305,8 @@ static void __vma_release(struct dma_fence_work *work) 
{

	struct i915_vma_work *vw = container_of(work, typeof(*vw), base);



	if (vw->pinned) {

		__i915_gem_object_unpin_pages(vw->pinned);

	if (vw->pinned)

		i915_gem_object_put(vw->pinned);

	}



	i915_vm_free_pt_stash(vw->vm, &vw->stash);

	i915_vm_put(vw->vm);
@@ -477,7 +475,6 @@ int i915_vma_bind(struct i915_vma *vma, 


		work->base.dma.error = 0; /* enable the queue_work() */



		__i915_gem_object_pin_pages(vma->obj);

		work->pinned = i915_gem_object_get(vma->obj);

	} else {

		if (vma->obj) {