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

Commit a00d825d authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Split GEN6 PPGTT cleanup 



This cleanup is similar to the GEN8 cleanup (though less necessary).
Having everything split will make cleaning the initialization path error
paths easier to understand.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c4ac524c

drivers/gpu/drm/i915/i915_gem_gtt.c

+19 −7
Original line number Diff line number Diff line
@@ -1001,22 +1001,21 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, 
		kunmap_atomic(pt_vaddr);

}



static void gen6_ppgtt_cleanup(struct i915_address_space *vm)

static void gen6_ppgtt_unmap_pages(struct i915_hw_ppgtt *ppgtt)

{

	struct i915_hw_ppgtt *ppgtt =

		container_of(vm, struct i915_hw_ppgtt, base);

	int i;



	list_del(&vm->global_link);

	drm_mm_takedown(&ppgtt->base.mm);

	drm_mm_remove_node(&ppgtt->node);



	if (ppgtt->pt_dma_addr) {

		for (i = 0; i < ppgtt->num_pd_entries; i++)

			pci_unmap_page(ppgtt->base.dev->pdev,

				       ppgtt->pt_dma_addr[i],

				       4096, PCI_DMA_BIDIRECTIONAL);

	}

}



static void gen6_ppgtt_free(struct i915_hw_ppgtt *ppgtt)

{

	int i;



	kfree(ppgtt->pt_dma_addr);

	for (i = 0; i < ppgtt->num_pd_entries; i++)
@@ -1024,6 +1023,19 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm) 
	kfree(ppgtt->pt_pages);

}



static void gen6_ppgtt_cleanup(struct i915_address_space *vm)

{

	struct i915_hw_ppgtt *ppgtt =

		container_of(vm, struct i915_hw_ppgtt, base);



	list_del(&vm->global_link);

	drm_mm_takedown(&ppgtt->base.mm);

	drm_mm_remove_node(&ppgtt->node);



	gen6_ppgtt_unmap_pages(ppgtt);

	gen6_ppgtt_free(ppgtt);

}



static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt)

{

#define GEN6_PD_ALIGN (PAGE_SIZE * 16)