On Tue, Jan 08, 2019 at 08:29:32PM +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. > Fix the single user. > > Add a note to drmP.h to avoid further use of it. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> > Cc: Sean Paul <sean@xxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> Skipping this one for now, since it doesn't apply cleanly without patch 4. Seems like none of the later patches requires it. -Daniel > --- > 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 <drm/drm_atomic.h> > #include <drm/drm_atomic_uapi.h> > #include <drm/drm_print.h> > +#include <drm/drm_util.h> > > #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 8fda5777471c..cd1e4be1dfb3 100644 > --- a/include/drm/drm_util.h > +++ b/include/drm/drm_util.h > @@ -37,6 +37,16 @@ > #include <linux/kgdb.h> > #include <linux/smp.h> > > +/* > + * 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) > +#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 > -- > 2.12.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
