2022-09-28 10:02:42

by Khalid Masum

Subject: [PATCH] drm/tve200: Use drm_* variants for logging

We have routines like drm_info/warn/err for logging. Use them instead
of dev_* variants to get drm-formatted log messages.

Signed-off-by: Khalid Masum <[email protected]>
---
drivers/gpu/drm/tve200/tve200_display.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
index 771bad881714..d453581b6b18 100644
--- a/drivers/gpu/drm/tve200/tve200_display.c
+++ b/drivers/gpu/drm/tve200/tve200_display.c
@@ -60,7 +60,7 @@ irqreturn_t tve200_irq(int irq, void *data)
}
writel(val, priv->regs + TVE200_CTRL);
} else
- dev_err(priv->drm->dev, "stray IRQ %08x\n", stat);
+ drm_err(priv->drm, "stray IRQ %08x\n", stat);

/* Clear the interrupt once done */
writel(stat, priv->regs + TVE200_INT_CLR);
@@ -146,7 +146,7 @@ static void tve200_display_enable(struct drm_simple_display_pipe *pipe,
}
if (retries == 5 &&
readl(priv->regs + TVE200_CTRL_4) & TVE200_CTRL_4_RESET) {
- dev_err(drm->dev, "can't get hardware out of reset\n");
+ drm_err(drm, "can't get hardware out of reset\n");
return;
}

@@ -171,14 +171,14 @@ static void tve200_display_enable(struct drm_simple_display_pipe *pipe,
if ((mode->hdisplay == 352 && mode->vdisplay == 240) || /* SIF(525) */
(mode->hdisplay == 352 && mode->vdisplay == 288)) { /* CIF(625) */
ctrl1 |= TVE200_CTRL_IPRESOL_CIF;
- dev_info(drm->dev, "CIF mode\n");
+ drm_info(drm, "CIF mode\n");
} else if (mode->hdisplay == 640 && mode->vdisplay == 480) {
ctrl1 |= TVE200_CTRL_IPRESOL_VGA;
- dev_info(drm->dev, "VGA mode\n");
+ drm_info(drm, "VGA mode\n");
} else if ((mode->hdisplay == 720 && mode->vdisplay == 480) ||
(mode->hdisplay == 720 && mode->vdisplay == 576)) {
ctrl1 |= TVE200_CTRL_IPRESOL_D1;
- dev_info(drm->dev, "D1 mode\n");
+ drm_info(drm, "D1 mode\n");
}

if (format & DRM_FORMAT_BIG_ENDIAN) {
@@ -226,7 +226,7 @@ static void tve200_display_enable(struct drm_simple_display_pipe *pipe,
ctrl1 |= TVE200_IPDMOD_YUV420;
break;
default:
- dev_err(drm->dev, "Unknown FB format 0x%08x\n",
+ drm_err(drm, "Unknown FB format 0x%08x\n",
fb->format->format);
break;
}
--
2.37.3

2022-10-03 19:05:50

by Linus Walleij

Subject: Re: [PATCH] drm/tve200: Use drm_* variants for logging

On Wed, Sep 28, 2022 at 11:31 AM Khalid Masum <[email protected]> wrote:

> We have routines like drm_info/warn/err for logging. Use them instead
> of dev_* variants to get drm-formatted log messages.
>
> Signed-off-by: Khalid Masum <[email protected]>

So is this the new thing? We've been through:
- DRM_INFO_ETC BIG CAPITAL LETTER MACROS
- Just use dev_info() & friends like everyone else
- Now drm_info() & co

Note I don't wanna bikeshed about this, just tell me there is
consensus now so we know what to do.

Yours,
Linus Walleij

2022-10-09 02:19:27

by Khalid Masum

Subject: Re: [PATCH] drm/tve200: Use drm_* variants for logging

On Tue, Oct 4, 2022 at 12:54 AM Linus Walleij <[email protected]> wrote:
>
> On Wed, Sep 28, 2022 at 11:31 AM Khalid Masum <[email protected]> wrote:
>
> > We have routines like drm_info/warn/err for logging. Use them instead
> > of dev_* variants to get drm-formatted log messages.
> >
> > Signed-off-by: Khalid Masum <[email protected]>
>
> So is this the new thing? We've been through:
> - DRM_INFO_ETC BIG CAPITAL LETTER MACROS
> - Just use dev_info() & friends like everyone else
> - Now drm_info() & co
>
> Note I don't wanna bikeshed about this, just tell me there is
> consensus now so we know what to do.

Hi,

I was working on a TODO described here:
https://github.com/torvalds/linux/blob/master/Documentation/gpu/todo.rst#convert-logging-to-drm_-functions-with-drm_device-paramater

"Convert logging to drm_* functions with drm_device paramater". I do not
know of any consensus by the way.

>
> Yours,
> Linus Walleij

Thanks,
-- Khalid Masum