On Thu, Jul 18, 2019 at 06:14:58PM +0200, Sam Ravnborg wrote: > drm_print.h used DRM_NAME - thus adding a dependency from > include/drm/drm_print.h => uapi/drm/drm.h > > Hardcode the name "drm" to break this dependency. > The idea is that there shall be a minimal dependency > between include/drm/* and uapi/* You might also want to clean up the other uses of DRM_NAME in armada and i915 while you're at it. The easiest way to satisfy Chris' usecase and remove the dependency would be to add #define DRM_PRINT_NAME "drm" in drm_print.h and use that. Sean > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Suggested-by: Daniel Vetter <daniel@xxxxxxxx> > Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> > Cc: Sean Paul <sean@xxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Rob Clark <robdclark@xxxxxxxxx> > Cc: Sean Paul <seanpaul@xxxxxxxxxxxx> > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > --- > include/drm/drm_print.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h > index a5d6f2f3e430..760d1bd0eaf1 100644 > --- a/include/drm/drm_print.h > +++ b/include/drm/drm_print.h > @@ -32,8 +32,6 @@ > #include <linux/device.h> > #include <linux/debugfs.h> > > -#include <drm/drm.h> > - > /** > * DOC: print > * > @@ -287,7 +285,7 @@ void drm_err(const char *format, ...); > /* Macros to make printk easier */ > > #define _DRM_PRINTK(once, level, fmt, ...) \ > - printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__) > + printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__) > > #define DRM_INFO(fmt, ...) \ > _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) > -- > 2.20.1 > -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
