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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 1B459C43331 for ; Fri, 3 Apr 2020 13:56:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F082B2073B for ; Fri, 3 Apr 2020 13:56:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F082B2073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E4646E128; Fri, 3 Apr 2020 13:56:52 +0000 (UTC) Received: from asavdk3.altibox.net (asavdk3.altibox.net [109.247.116.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id B83686E128 for ; Fri, 3 Apr 2020 13:56:50 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id 6E7A92003E; Fri, 3 Apr 2020 15:56:47 +0200 (CEST) Date: Fri, 3 Apr 2020 15:56:45 +0200 From: Sam Ravnborg To: Daniel Vetter Subject: Re: [PATCH 1/2] drm/pci: Move drm_pci_alloc/free under CONFIG_DRM_LEGACY Message-ID: <20200403135645.GA1549@ravnborg.org> References: <20200403110610.2344842-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200403110610.2344842-1-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=eMA9ckh1 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=QyXUC8HyAAAA:8 a=7gkXJVJtAAAA:8 a=e5mUnYsNAAAA:8 a=t0KrP7e3x-nvVacQwPwA:9 a=CjuIK1q_8ugA:10 a=E9Po1WZjFZOl8hwRPBS3:22 a=Vxmtnl_E_bksehYqCbjh:22 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , DRI Development Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Daniel On Fri, Apr 03, 2020 at 01:06:09PM +0200, Daniel Vetter wrote: > All other users have been removed, yay! > > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/drm_pci.c | 3 +++ > include/drm/drm_legacy.h | 15 +++++++++++++++ > include/drm/drm_pci.h | 26 -------------------------- > 3 files changed, 18 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c > index 81aa21561982..131b7a139fda 100644 > --- a/drivers/gpu/drm/drm_pci.c > +++ b/drivers/gpu/drm/drm_pci.c > @@ -36,6 +36,8 @@ > #include "drm_internal.h" > #include "drm_legacy.h" > > +#ifdef CONFIG_DRM_LEGACY > + > /** > * drm_pci_alloc - Allocate a PCI consistent memory block, for DMA. > * @dev: DRM device > @@ -93,6 +95,7 @@ void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) > } > > EXPORT_SYMBOL(drm_pci_free); > +#endif > > static int drm_get_pci_domain(struct drm_device *dev) > { > diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h > index dcef3598f49e..b53c3686c5fc 100644 > --- a/include/drm/drm_legacy.h > +++ b/include/drm/drm_legacy.h > @@ -194,11 +194,26 @@ void drm_legacy_idlelock_release(struct drm_lock_data *lock); > > #ifdef CONFIG_PCI > > +struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, > + size_t align); > +void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); ^ checkpatch rightfully complains about this. With this detail fixed: Reviewed-by: Sam Ravnborg > + > int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); > void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); > > #else > > +static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, > + size_t size, size_t align) > +{ > + return NULL; > +} > + > +static inline void drm_pci_free(struct drm_device *dev, > + struct drm_dma_handle *dmah) > +{ > +} > + > static inline int drm_legacy_pci_init(struct drm_driver *driver, > struct pci_driver *pdriver) > { > diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h > index 3941b0255ecf..1bf31131960e 100644 > --- a/include/drm/drm_pci.h > +++ b/include/drm/drm_pci.h > @@ -34,30 +34,4 @@ > > #include > > -struct drm_dma_handle; > -struct drm_device; > -struct drm_driver; > -struct drm_master; > - > -#ifdef CONFIG_PCI > - > -struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, > - size_t align); > -void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); > - > -#else > - > -static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, > - size_t size, size_t align) > -{ > - return NULL; > -} > - > -static inline void drm_pci_free(struct drm_device *dev, > - struct drm_dma_handle *dmah) > -{ > -} > - > -#endif > - > #endif /* _DRM_PCI_H_ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel