Re: [PATCH v4 2/6] drm/nouveau: Add NV_PRINTK_ONCE and variants

[Lyude Paul]

On Thu, 2018-09-06 at 22:35 -0700, Joe Perches wrote:
> On Thu, 2018-09-06 at 17:43 -0400, Lyude Paul wrote:
> > Since we're about to use this in nouveau_backlight.c. Same thing as
> > DRM_WARN_ONCE, DRM_INFO_ONCE, etc...
> 
> Can you redefine this in terms of the patches I submitted
> instead?
> 
> https://lore.kernel.org/patchwork/patch/979598/
> https://lore.kernel.org/patchwork/patch/979601/

Unfortunately this patch series has already been merged:

https://github.com/skeggsb/nouveau/commit/c5082a8e3d84330140b9250692a3f4c38d7da3ea

So it is probably a better idea to do this the other way around and just
rebase your patches on top of that
> 
> 
> > Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
> > Cc: Karol Herbst <kherbst@xxxxxxxxxx>
> > ---
> >  drivers/gpu/drm/nouveau/nouveau_drv.h | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h
> > b/drivers/gpu/drm/nouveau/nouveau_drv.h
> > index 6e1acaec3400..d9d687916553 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_drv.h
> > +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
> > @@ -244,10 +244,12 @@ void nouveau_drm_device_remove(struct drm_device
> > *dev);
> >  	struct nouveau_cli *_cli =
> > (c);                                        \
> >  	dev_##l(_cli->drm->dev->dev, "%s: "f, _cli->name,
> > ##a);                \
> >  } while(0)
> > +
> >  #define NV_FATAL(drm,f,a...) NV_PRINTK(crit, &(drm)->client, f, ##a)
> >  #define NV_ERROR(drm,f,a...) NV_PRINTK(err, &(drm)->client, f, ##a)
> >  #define NV_WARN(drm,f,a...) NV_PRINTK(warn, &(drm)->client, f, ##a)
> >  #define NV_INFO(drm,f,a...) NV_PRINTK(info, &(drm)->client, f, ##a)
> > +
> >  #define NV_DEBUG(drm,f,a...) do
> > {                                              \
> >  	if (unlikely(drm_debug &
> > DRM_UT_DRIVER))                               \
> >  		NV_PRINTK(info, &(drm)->client, f,
> > ##a);                       \
> > @@ -257,6 +259,12 @@ void nouveau_drm_device_remove(struct drm_device
> > *dev);
> >  		NV_PRINTK(info, &(drm)->client, f,
> > ##a);                       \
> >  } while(0)
> >  
> > +#define NV_PRINTK_ONCE(l,c,f,a...) NV_PRINTK(l##_once,c,f, ##a)
> > +
> > +#define NV_ERROR_ONCE(drm,f,a...) NV_PRINTK_ONCE(err, &(drm)->client, f,
> > ##a)
> > +#define NV_WARN_ONCE(drm,f,a...) NV_PRINTK_ONCE(warn, &(drm)->client, f,
> > ##a)
> > +#define NV_INFO_ONCE(drm,f,a...) NV_PRINTK_ONCE(info, &(drm)->client, f,
> > ##a)
> > +
> >  extern int nouveau_modeset;
> >  
> >  #endif
-- 
Cheers,
	Lyude Paul