From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v4 2/8] drm: move EXPORT_SYMBOL_FOR_TESTS_ONLY to drm_util.h Date: Fri, 18 Jan 2019 17:21:28 +0200 Message-ID: <20190118152128.GE5275@pendragon.ideasonboard.com> References: <20190112193251.20450-1-sam@ravnborg.org> <20190112193251.20450-3-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Return-path: Content-Disposition: inline In-Reply-To: <20190112193251.20450-3-sam@ravnborg.org> Sender: linux-kernel-owner@vger.kernel.org To: Sam Ravnborg Cc: Alex Deucher , Alexey Brodkin , Andrzej Hajda , Benjamin Gaignard , Chen Feng , Christian Konig , Daniel Vetter , David Airlie , David Zhou , Eric Anholt , Gerd Hoffmann , Kieran Bingham , Maarten Lankhorst , Maxime Ripard , Philippe Cornu , Rob Clark , Rongrong Zou , Sean Paul , Tomi Valkeinen List-Id: dri-devel@lists.freedesktop.org Hi Sam, Thank you for the patch. On Sat, Jan 12, 2019 at 08:32:45PM +0100, Sam Ravnborg wrote: > In the quest to get rid of drmP.h move the newly > added EXPORT_SYMBOL_FOR_TESTS_ONLY to drm_util.h. Would it make sense to move it to drm_internal.h as it's really for internal use of the DRM core ? > Fix the single user. > > Add a note to drmP.h to avoid further use of it. > > Signed-off-by: Sam Ravnborg > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Sean Paul > Cc: David Airlie > Cc: Daniel Vetter > --- > drivers/gpu/drm/drm_framebuffer.c | 1 + > include/drm/drmP.h | 11 ++++++----- > include/drm/drm_util.h | 10 ++++++++++ > 3 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c > index fcaea8f50513..7abcb265a108 100644 > --- a/drivers/gpu/drm/drm_framebuffer.c > +++ b/drivers/gpu/drm/drm_framebuffer.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > > #include "drm_internal.h" > #include "drm_crtc_internal.h" > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index bc4cb3732407..3f5c577c9dbd 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -94,10 +94,11 @@ struct dma_buf_attachment; > struct pci_dev; > struct pci_controller; > > -#if defined(CONFIG_DRM_DEBUG_SELFTEST_MODULE) > -#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x) EXPORT_SYMBOL(x) > -#else > -#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x) > -#endif > +/* > + * NOTE: drmP.h is obsolete - do NOT add anything to this file > + * > + * Do not include drmP.h in new files. > + * Work is ongoing to remove drmP.h includes from existing files > + */ > > #endif > diff --git a/include/drm/drm_util.h b/include/drm/drm_util.h > index f776a55e5508..0500da65b1d1 100644 > --- a/include/drm/drm_util.h > +++ b/include/drm/drm_util.h > @@ -37,6 +37,16 @@ > #include > #include > > +/* > + * Use EXPORT_SYMBOL_FOR_TESTS_ONLY() for functions that shall > + * only be visible for drmselftests. > + */ > +#if defined(CONFIG_DRM_DEBUG_SELFTEST_MODULE) > +#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x) EXPORT_SYMBOL(x) I'd make this EXPORT_SYMBOL_GPL given the internal use, but that change should be part of a separate patch. Reviewed-by: Laurent Pinchart > +#else > +#define EXPORT_SYMBOL_FOR_TESTS_ONLY(x) > +#endif > + > /** > * for_each_if - helper for handling conditionals in various for_each macros > * @condition: The condition to check -- Regards, Laurent Pinchart