Commit 92e71b06 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: use the TTM dummy page instead of allocating one 



We have a global dummy page in TTM, use that one instead of allocating a
new one.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a02497b7

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −9
Original line number Diff line number Diff line
@@ -343,14 +343,6 @@ struct amdgpu_ih_funcs { 
bool amdgpu_get_bios(struct amdgpu_device *adev);

bool amdgpu_read_bios(struct amdgpu_device *adev);



/*

 * Dummy page

 */

struct amdgpu_dummy_page {

	struct page	*page;

	dma_addr_t	addr;

};



/*

 * Clocks

 */
@@ -1505,7 +1497,7 @@ struct amdgpu_device { 
	/* MC */

	struct amdgpu_gmc		gmc;

	struct amdgpu_gart		gart;

	struct amdgpu_dummy_page	dummy_page;

	dma_addr_t			dummy_page_addr;

	struct amdgpu_vm_manager	vm_manager;

	struct amdgpu_vmhub             vmhub[AMDGPU_MAX_VMHUBS];

drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c

+13 −16
Original line number Diff line number Diff line
@@ -68,17 +68,15 @@ 
 */

static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)

{

	if (adev->dummy_page.page)

	struct page *dummy_page = adev->mman.bdev.glob->dummy_read_page;



	if (adev->dummy_page_addr)

		return 0;

	adev->dummy_page.page = alloc_page(GFP_DMA32 | GFP_KERNEL | __GFP_ZERO);

	if (adev->dummy_page.page == NULL)

		return -ENOMEM;

	adev->dummy_page.addr = pci_map_page(adev->pdev, adev->dummy_page.page,

					0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

	if (pci_dma_mapping_error(adev->pdev, adev->dummy_page.addr)) {

	adev->dummy_page_addr = pci_map_page(adev->pdev, dummy_page, 0,

					     PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

	if (pci_dma_mapping_error(adev->pdev, adev->dummy_page_addr)) {

		dev_err(&adev->pdev->dev, "Failed to DMA MAP the dummy page\n");

		__free_page(adev->dummy_page.page);

		adev->dummy_page.page = NULL;

		adev->dummy_page_addr = 0;

		return -ENOMEM;

	}

	return 0;
@@ -93,12 +91,11 @@ static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev) 
 */

static void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)

{

	if (adev->dummy_page.page == NULL)

	if (!adev->dummy_page_addr)

		return;

	pci_unmap_page(adev->pdev, adev->dummy_page.addr,

	pci_unmap_page(adev->pdev, adev->dummy_page_addr,

		       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

	__free_page(adev->dummy_page.page);

	adev->dummy_page.page = NULL;

	adev->dummy_page_addr = 0;

}



/**
@@ -236,7 +233,7 @@ int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, 
#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS

		adev->gart.pages[p] = NULL;

#endif

		page_base = adev->dummy_page.addr;

		page_base = adev->dummy_page_addr;

		if (!adev->gart.ptr)

			continue;
@@ -347,7 +344,7 @@ int amdgpu_gart_init(struct amdgpu_device *adev) 
{

	int r;



	if (adev->dummy_page.page)

	if (adev->dummy_page_addr)

		return 0;



	/* We need PAGE_SIZE >= AMDGPU_GPU_PAGE_SIZE */

drivers/gpu/drm/amd/amdgpu/cik_ih.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int cik_ih_irq_init(struct amdgpu_device *adev) 
	cik_ih_disable_interrupts(adev);



	/* setup interrupt control */

	WREG32(mmINTERRUPT_CNTL2, adev->dummy_page.addr >> 8);

	WREG32(mmINTERRUPT_CNTL2, adev->dummy_page_addr >> 8);

	interrupt_cntl = RREG32(mmINTERRUPT_CNTL);

	/* INTERRUPT_CNTL__IH_DUMMY_RD_OVERRIDE_MASK=0 - dummy read disabled with msi, enabled without msi

	 * INTERRUPT_CNTL__IH_DUMMY_RD_OVERRIDE_MASK=1 - dummy read controlled by IH_DUMMY_RD_EN

drivers/gpu/drm/amd/amdgpu/cz_ih.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int cz_ih_irq_init(struct amdgpu_device *adev) 
	cz_ih_disable_interrupts(adev);



	/* setup interrupt control */

	WREG32(mmINTERRUPT_CNTL2, adev->dummy_page.addr >> 8);

	WREG32(mmINTERRUPT_CNTL2, adev->dummy_page_addr >> 8);

	interrupt_cntl = RREG32(mmINTERRUPT_CNTL);

	/* INTERRUPT_CNTL__IH_DUMMY_RD_OVERRIDE_MASK=0 - dummy read disabled with msi, enabled without msi

	 * INTERRUPT_CNTL__IH_DUMMY_RD_OVERRIDE_MASK=1 - dummy read controlled by IH_DUMMY_RD_EN

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c

+2 −2
Original line number Diff line number Diff line
@@ -92,9 +92,9 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 


	/* Program "protection fault". */

	WREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32,

		     (u32)(adev->dummy_page.addr >> 12));

		     (u32)(adev->dummy_page_addr >> 12));

	WREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32,

		     (u32)((u64)adev->dummy_page.addr >> 44));

		     (u32)((u64)adev->dummy_page_addr >> 44));



	WREG32_FIELD15(GC, 0, VM_L2_PROTECTION_FAULT_CNTL2,

		       ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY, 1);