Merge tag 'f2fs-for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gart.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index b36405170ff35fa876a6c6e7d4754b29a7b73e20..76efd5f8950fcd3b2a6f968b9abfa7352e7b11f9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -76,7 +76,7 @@ static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)
        if (adev->dummy_page_addr)
                return 0;
        adev->dummy_page_addr = dma_map_page(&adev->pdev->dev, dummy_page, 0,
        if (adev->dummy_page_addr)
                return 0;
        adev->dummy_page_addr = dma_map_page(&adev->pdev->dev, dummy_page, 0,

-                                            PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+                                            PAGE_SIZE, DMA_BIDIRECTIONAL);

        if (dma_mapping_error(&adev->pdev->dev, adev->dummy_page_addr)) {
                dev_err(&adev->pdev->dev, "Failed to DMA MAP the dummy page\n");
                adev->dummy_page_addr = 0;
        if (dma_mapping_error(&adev->pdev->dev, adev->dummy_page_addr)) {
                dev_err(&adev->pdev->dev, "Failed to DMA MAP the dummy page\n");
                adev->dummy_page_addr = 0;


@@ -96,8 +96,8 @@ void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)
 {
        if (!adev->dummy_page_addr)
                return;
 {
        if (!adev->dummy_page_addr)
                return;

-       pci_unmap_page(adev->pdev, adev->dummy_page_addr,
-                      PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+       dma_unmap_page(&adev->pdev->dev, adev->dummy_page_addr, PAGE_SIZE,
+                      DMA_BIDIRECTIONAL);

        adev->dummy_page_addr = 0;
 }
 
        adev->dummy_page_addr = 0;
 }