Message ID | 20210721175526.22020-4-sean@poorly.run (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | None | expand |
On Wed, Jul 21, 2021 at 1:55 PM Sean Paul <sean@poorly.run> wrote: > > From: Sean Paul <seanpaul@chromium.org> > > Use drm logging helpers to add support for the upcoming tracefs > implementation. > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-4-sean@poorly.run #v5 > > Changes in v5: > -Added to the set > Changes in v6: > -None > --- > drivers/gpu/drm/i915/i915_utils.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c > index f9e780dee9de..d858c92c6997 100644 > --- a/drivers/gpu/drm/i915/i915_utils.c > +++ b/drivers/gpu/drm/i915/i915_utils.c > @@ -30,10 +30,9 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, > vaf.va = &args; > > if (is_error) > - dev_printk(level, kdev, "%pV", &vaf); > + drm_dev_printk(kdev, level, "%pV", &vaf); > else > - dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV", > - __builtin_return_address(0), &vaf); > + drm_err(&dev_priv->drm, "%pV", &vaf); its slightly jarring to see drm_err() in the !is_err branch. warn or notice seems better. > > va_end(args); > > -- > Sean Paul, Software Engineer, Google / Chromium OS >
diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c index f9e780dee9de..d858c92c6997 100644 --- a/drivers/gpu/drm/i915/i915_utils.c +++ b/drivers/gpu/drm/i915/i915_utils.c @@ -30,10 +30,9 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, vaf.va = &args; if (is_error) - dev_printk(level, kdev, "%pV", &vaf); + drm_dev_printk(kdev, level, "%pV", &vaf); else - dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV", - __builtin_return_address(0), &vaf); + drm_err(&dev_priv->drm, "%pV", &vaf); va_end(args);