From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BCF8C4320A for ; Mon, 23 Aug 2021 17:51:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1CA0F613A7 for ; Mon, 23 Aug 2021 17:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231901AbhHWRvz (ORCPT ); Mon, 23 Aug 2021 13:51:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231843AbhHWRvz (ORCPT ); Mon, 23 Aug 2021 13:51:55 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B788C061575; Mon, 23 Aug 2021 10:51:12 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id g66-20020a9d12c8000000b0051aeba607f1so30013348otg.11; Mon, 23 Aug 2021 10:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=3rREAyPOKdLF6NDEzn+rP2y6ycvNQqshJTP26LTwLYA=; b=AUOWTbDAsF2kSoMy1ltDzWDDka9y3jbqDIiddEymQ6xYDkzCjOrs3Arh+mUPc2ULzX pZ1Xyx4b0a6z4NiVFlfzzt+OYk/qf+uWcy4I1I9eym7owd7esqPvyqFI5M+P/6yZTn3F oiIaHKx3XYPXtNJo9ZfB2mFN0V/lhzcrJhGJuRMblyskmXqnN+f3MpAUsKjLhJZCYIaR Oekero8asdPtUvYhgt67HWgtdK9pzdNpd4nbp6Fad+KR19d//l5Zw2zgGylV3CZ6B4Fx 14lQ0Mao5BL3xPVWPNAIXrLsdhNVNySHY68tiW2WXSVA1+QBaEXinzXxCAQHy5mJnVl4 nM1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=3rREAyPOKdLF6NDEzn+rP2y6ycvNQqshJTP26LTwLYA=; b=B3j0cvCUapeUqStaAs+TTfad9CVOinwmNZAGDpa0U11oZug5B7QeSsI2O8mwc8igjH W5uvu9kuhAWHUCwZCLhF4OdoJB3xN/22MfBX6qKnCLQErAiNys1ng8X4EWeLzBA14bWu BOAibftHHeJt0D/2UeCXbkUKde7qR7Xi4m5KF4xp9q5tdZydPUZtu9+rjhcPVMqf2mLr 6+LDcmnyd1bicC15DD6wvwYCvSHbr3cAZmA5+Wj4cMmyA5wz54H4LdK2uC1pDLhC5yqH MR58BXx4driXF63ENySPgSfaTN/ILresiNR3WyyovN7YGhHBH5GzGH8OgAZnjGZyPN9m BcHg== X-Gm-Message-State: AOAM533Q6Qg1ApYpdsLzuMu3nOrLooysK0zCTVl5d5t/6ly4Kc/0F89r DXNBrrnuTLSKb7xZoi1WIi+51Ji0FFZxHMbLv7I= X-Google-Smtp-Source: ABdhPJyCzesKPtsp+veFGNMoo192/z38L5TnShuXRKh6DQbbg8b3d22M+M90/KZ4CSNKrPdy52aVEtHwkBUmmgc7BFc= X-Received: by 2002:a05:6808:483:: with SMTP id z3mr11942026oid.5.1629741071769; Mon, 23 Aug 2021 10:51:11 -0700 (PDT) MIME-Version: 1.0 References: <4421bb63-3e77-0646-a647-c387a5df060c@amd.com> In-Reply-To: <4421bb63-3e77-0646-a647-c387a5df060c@amd.com> From: Alex Deucher Date: Mon, 23 Aug 2021 13:51:00 -0400 Message-ID: Subject: Re: [PATCH] drm/amdgpu: switch from 'pci_' to 'dma_' API To: =?UTF-8?Q?Christian_K=C3=B6nig?= Cc: Christophe JAILLET , "Deucher, Alexander" , xinhui pan , Dave Airlie , Daniel Vetter , Intel Graphics Development , Maling list - DRI developers , LKML , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org Applied. Thanks! Alex On Mon, Aug 23, 2021 at 2:16 AM Christian K=C3=B6nig 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 > > Reviewed-by: Christian K=C3=B6nig > > > --- > > If needed, see post from Christoph Hellwig on the kernel-janitors ML: > > https://marc.info/?l=3Dkernel-janitors&m=3D158745678307186&w=3D4 > > --- > > 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 =3D dma_map_page(&adev->pdev->dev, dummy_pa= ge, 0, > > - PAGE_SIZE, PCI_DMA_BIDIRECTI= ONAL); > > + 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 pa= ge\n"); > > adev->dummy_page_addr =3D 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 =3D 0; > > } > > >