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

Commit 55e0037a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: move dummy page functions to amdgpu_gart.c 



It's the only place they are used.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 39c640c0

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

+0 −3
Original line number Diff line number Diff line
@@ -377,9 +377,6 @@ struct amdgpu_dummy_page { 
	struct page	*page;

	dma_addr_t	addr;

};

int amdgpu_dummy_page_init(struct amdgpu_device *adev);

void amdgpu_dummy_page_fini(struct amdgpu_device *adev);





/*

 * Clocks

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

+0 −45
Original line number Diff line number Diff line
@@ -724,51 +724,6 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev) 
	return true;

}



/**

 * amdgpu_dummy_page_init - init dummy page used by the driver

 *

 * @adev: amdgpu_device pointer

 *

 * Allocate the dummy page used by the driver (all asics).

 * This dummy page is used by the driver as a filler for gart entries

 * when pages are taken out of the GART

 * Returns 0 on sucess, -ENOMEM on failure.

 */

int amdgpu_dummy_page_init(struct amdgpu_device *adev)

{

	if (adev->dummy_page.page)

		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)) {

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

		__free_page(adev->dummy_page.page);

		adev->dummy_page.page = NULL;

		return -ENOMEM;

	}

	return 0;

}



/**

 * amdgpu_dummy_page_fini - free dummy page used by the driver

 *

 * @adev: amdgpu_device pointer

 *

 * Frees the dummy page used by the driver (all asics).

 */

void amdgpu_dummy_page_fini(struct amdgpu_device *adev)

{

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

		return;

	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;

}



/* if we get transitioned to only one device, take VGA back */

/**

 * amdgpu_device_vga_set_decode - enable/disable vga decode

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

+47 −2
Original line number Diff line number Diff line
@@ -56,6 +56,51 @@ 
 * Common GART table functions.

 */



/**

 * amdgpu_dummy_page_init - init dummy page used by the driver

 *

 * @adev: amdgpu_device pointer

 *

 * Allocate the dummy page used by the driver (all asics).

 * This dummy page is used by the driver as a filler for gart entries

 * when pages are taken out of the GART

 * Returns 0 on sucess, -ENOMEM on failure.

 */

static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)

{

	if (adev->dummy_page.page)

		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)) {

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

		__free_page(adev->dummy_page.page);

		adev->dummy_page.page = NULL;

		return -ENOMEM;

	}

	return 0;

}



/**

 * amdgpu_dummy_page_fini - free dummy page used by the driver

 *

 * @adev: amdgpu_device pointer

 *

 * Frees the dummy page used by the driver (all asics).

 */

static void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)

{

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

		return;

	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;

}



/**

 * amdgpu_gart_table_vram_alloc - allocate vram for gart page table

 *
@@ -308,7 +353,7 @@ int amdgpu_gart_init(struct amdgpu_device *adev) 
		DRM_ERROR("Page size is smaller than GPU page size!\n");

		return -EINVAL;

	}

	r = amdgpu_dummy_page_init(adev);

	r = amdgpu_gart_dummy_page_init(adev);

	if (r)

		return r;

	/* Compute table size */
@@ -340,5 +385,5 @@ void amdgpu_gart_fini(struct amdgpu_device *adev) 
	vfree(adev->gart.pages);

	adev->gart.pages = NULL;

#endif

	amdgpu_dummy_page_fini(adev);

	amdgpu_gart_dummy_page_fini(adev);

}