lkml.org 
[lkml]   [2021]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] drm/amdgpu: switch from 'pci_' to 'dma_' API
Applied.  Thanks!

Alex

On Mon, Aug 23, 2021 at 2:16 AM Christian König
<christian.koenig@amd.com> wrote:
>
> Am 22.08.21 um 23:21 schrieb Christophe JAILLET:
> > The wrappers in include/linux/pci-dma-compat.h should go away.
> >
> > The patch has been generated with the coccinelle script below.
> >
> > It has been compile tested.
> >
> > @@
> > @@
> > - PCI_DMA_BIDIRECTIONAL
> > + DMA_BIDIRECTIONAL
> >
> > @@
> > @@
> > - PCI_DMA_TODEVICE
> > + DMA_TO_DEVICE
> >
> > @@
> > @@
> > - PCI_DMA_FROMDEVICE
> > + DMA_FROM_DEVICE
> >
> > @@
> > @@
> > - PCI_DMA_NONE
> > + DMA_NONE
> >
> > @@
> > expression e1, e2, e3;
> > @@
> > - pci_alloc_consistent(e1, e2, e3)
> > + dma_alloc_coherent(&e1->dev, e2, e3, GFP_)
> >
> > @@
> > expression e1, e2, e3;
> > @@
> > - pci_zalloc_consistent(e1, e2, e3)
> > + dma_alloc_coherent(&e1->dev, e2, e3, GFP_)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_free_consistent(e1, e2, e3, e4)
> > + dma_free_coherent(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_map_single(e1, e2, e3, e4)
> > + dma_map_single(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_unmap_single(e1, e2, e3, e4)
> > + dma_unmap_single(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4, e5;
> > @@
> > - pci_map_page(e1, e2, e3, e4, e5)
> > + dma_map_page(&e1->dev, e2, e3, e4, e5)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_unmap_page(e1, e2, e3, e4)
> > + dma_unmap_page(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_map_sg(e1, e2, e3, e4)
> > + dma_map_sg(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_unmap_sg(e1, e2, e3, e4)
> > + dma_unmap_sg(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_dma_sync_single_for_cpu(e1, e2, e3, e4)
> > + dma_sync_single_for_cpu(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_dma_sync_single_for_device(e1, e2, e3, e4)
> > + dma_sync_single_for_device(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_dma_sync_sg_for_cpu(e1, e2, e3, e4)
> > + dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2, e3, e4;
> > @@
> > - pci_dma_sync_sg_for_device(e1, e2, e3, e4)
> > + dma_sync_sg_for_device(&e1->dev, e2, e3, e4)
> >
> > @@
> > expression e1, e2;
> > @@
> > - pci_dma_mapping_error(e1, e2)
> > + dma_mapping_error(&e1->dev, e2)
> >
> > @@
> > expression e1, e2;
> > @@
> > - pci_set_dma_mask(e1, e2)
> > + dma_set_mask(&e1->dev, e2)
> >
> > @@
> > expression e1, e2;
> > @@
> > - pci_set_consistent_dma_mask(e1, e2)
> > + dma_set_coherent_mask(&e1->dev, e2)
> >
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>
> > ---
> > If needed, see post from Christoph Hellwig on the kernel-janitors ML:
> > https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> > index b36405170ff3..76efd5f8950f 100644
> > --- 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,
> > - 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;
> > @@ -96,8 +96,8 @@ void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)
> > {
> > 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;
> > }
> >
>

\
 
 \ /
  Last update: 2021-08-23 19:51    [W:0.717 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site