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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 517CBC433F5 for ; Mon, 15 Nov 2021 13:40:29 +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 E3C9761AF0 for ; Mon, 15 Nov 2021 13:40:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E3C9761AF0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 069A16E112; Mon, 15 Nov 2021 13:40:28 +0000 (UTC) Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id B4F346E112 for ; Mon, 15 Nov 2021 13:40:26 +0000 (UTC) Received: from pendragon.ideasonboard.com (117.145-247-81.adsl-dyn.isp.belgacom.be [81.247.145.117]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 47C5A93; Mon, 15 Nov 2021 14:40:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1636983625; bh=hJqaKcHD1tvfKC6NFjnSHYUW3wehP5+Dmgbtxqf+8zQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AxiKFOk5iTvVxI/yEVENpB1U2CTNCAovSME4Jb+3anmDsLWMLUTkiUoxJ+CoWJjb5 HTSKDKNcQOSFRQ1pbaAK9iEiqbZmflasoexeJRxm/pPExeotlFm62Q4P68cUtGxlrp RfgJ5lEZRxjFYWCnhC+A9uz+fM4Hx3QBnlm1W3Bw= Date: Mon, 15 Nov 2021 15:40:03 +0200 From: Laurent Pinchart To: Thomas Zimmermann Subject: Re: [PATCH 1/3] drm/cma-helper: Move driver and file ops to the end of header Message-ID: References: <20211115120148.21766-1-tzimmermann@suse.de> <20211115120148.21766-2-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20211115120148.21766-2-tzimmermann@suse.de> 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: emma@anholt.net, airlied@linux.ie, linux-renesas-soc@vger.kernel.org, kieran.bingham+renesas@ideasonboard.com, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Thomas, Thank you for the patch. On Mon, Nov 15, 2021 at 01:01:46PM +0100, Thomas Zimmermann wrote: > Restructure the header file for CMA helpers by moving declarations > for driver and file operations to the end of the file. No functional > changes. > > Signed-off-by: Thomas Zimmermann I'm not sure to see what we gain from this, but I don't mind. Reviewed-by: Laurent Pinchart > --- > include/drm/drm_gem_cma_helper.h | 114 ++++++++++++++++--------------- > 1 file changed, 60 insertions(+), 54 deletions(-) > > diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h > index cd13508acbc1..e0fb7a0cf03f 100644 > --- a/include/drm/drm_gem_cma_helper.h > +++ b/include/drm/drm_gem_cma_helper.h > @@ -32,77 +32,40 @@ struct drm_gem_cma_object { > #define to_drm_gem_cma_obj(gem_obj) \ > container_of(gem_obj, struct drm_gem_cma_object, base) > > -#ifndef CONFIG_MMU > -#define DRM_GEM_CMA_UNMAPPED_AREA_FOPS \ > - .get_unmapped_area = drm_gem_cma_get_unmapped_area, > -#else > -#define DRM_GEM_CMA_UNMAPPED_AREA_FOPS > -#endif > - > -/** > - * DEFINE_DRM_GEM_CMA_FOPS() - macro to generate file operations for CMA drivers > - * @name: name for the generated structure > - * > - * This macro autogenerates a suitable &struct file_operations for CMA based > - * drivers, which can be assigned to &drm_driver.fops. Note that this structure > - * cannot be shared between drivers, because it contains a reference to the > - * current module using THIS_MODULE. > - * > - * Note that the declaration is already marked as static - if you need a > - * non-static version of this you're probably doing it wrong and will break the > - * THIS_MODULE reference by accident. > - */ > -#define DEFINE_DRM_GEM_CMA_FOPS(name) \ > - static const struct file_operations name = {\ > - .owner = THIS_MODULE,\ > - .open = drm_open,\ > - .release = drm_release,\ > - .unlocked_ioctl = drm_ioctl,\ > - .compat_ioctl = drm_compat_ioctl,\ > - .poll = drm_poll,\ > - .read = drm_read,\ > - .llseek = noop_llseek,\ > - .mmap = drm_gem_mmap,\ > - DRM_GEM_CMA_UNMAPPED_AREA_FOPS \ > - } > - > /* free GEM object */ > void drm_gem_cma_free_object(struct drm_gem_object *gem_obj); > > -/* create memory region for DRM framebuffer */ > -int drm_gem_cma_dumb_create_internal(struct drm_file *file_priv, > - struct drm_device *drm, > - struct drm_mode_create_dumb *args); > - > -/* create memory region for DRM framebuffer */ > -int drm_gem_cma_dumb_create(struct drm_file *file_priv, > - struct drm_device *drm, > - struct drm_mode_create_dumb *args); > - > /* allocate physical memory */ > struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, > size_t size); > > extern const struct vm_operations_struct drm_gem_cma_vm_ops; > > -#ifndef CONFIG_MMU > -unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, > - unsigned long addr, > - unsigned long len, > - unsigned long pgoff, > - unsigned long flags); > -#endif > - > void drm_gem_cma_print_info(struct drm_printer *p, unsigned int indent, > const struct drm_gem_object *obj); > > struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_object *obj); > +int drm_gem_cma_vmap(struct drm_gem_object *obj, struct dma_buf_map *map); > +int drm_gem_cma_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); > + > +/* > + * Driver ops > + */ > + > +/* create memory region for DRM framebuffer */ > +int drm_gem_cma_dumb_create_internal(struct drm_file *file_priv, > + struct drm_device *drm, > + struct drm_mode_create_dumb *args); > + > +/* create memory region for DRM framebuffer */ > +int drm_gem_cma_dumb_create(struct drm_file *file_priv, > + struct drm_device *drm, > + struct drm_mode_create_dumb *args); > + > struct drm_gem_object * > drm_gem_cma_prime_import_sg_table(struct drm_device *dev, > struct dma_buf_attachment *attach, > struct sg_table *sgt); > -int drm_gem_cma_vmap(struct drm_gem_object *obj, struct dma_buf_map *map); > -int drm_gem_cma_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); > > /** > * DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE - CMA GEM driver operations > @@ -185,4 +148,47 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *drm, > struct dma_buf_attachment *attach, > struct sg_table *sgt); > > +/* > + * File ops > + */ > + > +#ifndef CONFIG_MMU > +unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, > + unsigned long addr, > + unsigned long len, > + unsigned long pgoff, > + unsigned long flags); > +#define DRM_GEM_CMA_UNMAPPED_AREA_FOPS \ > + .get_unmapped_area = drm_gem_cma_get_unmapped_area, > +#else > +#define DRM_GEM_CMA_UNMAPPED_AREA_FOPS > +#endif > + > +/** > + * DEFINE_DRM_GEM_CMA_FOPS() - macro to generate file operations for CMA drivers > + * @name: name for the generated structure > + * > + * This macro autogenerates a suitable &struct file_operations for CMA based > + * drivers, which can be assigned to &drm_driver.fops. Note that this structure > + * cannot be shared between drivers, because it contains a reference to the > + * current module using THIS_MODULE. > + * > + * Note that the declaration is already marked as static - if you need a > + * non-static version of this you're probably doing it wrong and will break the > + * THIS_MODULE reference by accident. > + */ > +#define DEFINE_DRM_GEM_CMA_FOPS(name) \ > + static const struct file_operations name = {\ > + .owner = THIS_MODULE,\ > + .open = drm_open,\ > + .release = drm_release,\ > + .unlocked_ioctl = drm_ioctl,\ > + .compat_ioctl = drm_compat_ioctl,\ > + .poll = drm_poll,\ > + .read = drm_read,\ > + .llseek = noop_llseek,\ > + .mmap = drm_gem_mmap,\ > + DRM_GEM_CMA_UNMAPPED_AREA_FOPS \ > + } > + > #endif /* __DRM_GEM_CMA_HELPER_H__ */ -- Regards, Laurent Pinchart