From: Jani Nikula <jani.nikula@linux.intel.com>
To: Simon Ser <contact@emersion.fr>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/framebuffer: convert to drm_dbg_kms()
Date: Mon, 05 Sep 2022 14:12:22 +0300 [thread overview]
Message-ID: <874jxmaxd5.fsf@intel.com> (raw)
In-Reply-To: <20220905103559.118561-1-contact@emersion.fr>
On Mon, 05 Sep 2022, Simon Ser <contact@emersion.fr> wrote:
> Replace DRM_DEBUG_KMS() with drm_dbg_kms() which allows specifying
> the DRM device to provide more context.
>
> Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/drm_framebuffer.c | 66 +++++++++++++++----------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
> index 185b04762e2c..2dd97473ca10 100644
> --- a/drivers/gpu/drm/drm_framebuffer.c
> +++ b/drivers/gpu/drm/drm_framebuffer.c
> @@ -87,13 +87,13 @@ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y,
> src_x > fb_width - src_w ||
> src_h > fb_height ||
> src_y > fb_height - src_h) {
> - DRM_DEBUG_KMS("Invalid source coordinates "
> - "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n",
> - src_w >> 16, ((src_w & 0xffff) * 15625) >> 10,
> - src_h >> 16, ((src_h & 0xffff) * 15625) >> 10,
> - src_x >> 16, ((src_x & 0xffff) * 15625) >> 10,
> - src_y >> 16, ((src_y & 0xffff) * 15625) >> 10,
> - fb->width, fb->height);
> + drm_dbg_kms(fb->dev, "Invalid source coordinates "
> + "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n",
> + src_w >> 16, ((src_w & 0xffff) * 15625) >> 10,
> + src_h >> 16, ((src_h & 0xffff) * 15625) >> 10,
> + src_x >> 16, ((src_x & 0xffff) * 15625) >> 10,
> + src_y >> 16, ((src_y & 0xffff) * 15625) >> 10,
> + fb->width, fb->height);
> return -ENOSPC;
> }
>
> @@ -125,7 +125,7 @@ int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,
>
> r.pixel_format = drm_driver_legacy_fb_format(dev, or->bpp, or->depth);
> if (r.pixel_format == DRM_FORMAT_INVALID) {
> - DRM_DEBUG("bad {bpp:%d, depth:%d}\n", or->bpp, or->depth);
> + drm_dbg_kms(dev, "bad {bpp:%d, depth:%d}\n", or->bpp, or->depth);
> return -EINVAL;
> }
>
> @@ -177,18 +177,18 @@ static int framebuffer_check(struct drm_device *dev,
>
> /* check if the format is supported at all */
> if (!__drm_format_info(r->pixel_format)) {
> - DRM_DEBUG_KMS("bad framebuffer format %p4cc\n",
> - &r->pixel_format);
> + drm_dbg_kms(dev, "bad framebuffer format %p4cc\n",
> + &r->pixel_format);
> return -EINVAL;
> }
>
> if (r->width == 0) {
> - DRM_DEBUG_KMS("bad framebuffer width %u\n", r->width);
> + drm_dbg_kms(dev, "bad framebuffer width %u\n", r->width);
> return -EINVAL;
> }
>
> if (r->height == 0) {
> - DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height);
> + drm_dbg_kms(dev, "bad framebuffer height %u\n", r->height);
> return -EINVAL;
> }
>
> @@ -202,12 +202,12 @@ static int framebuffer_check(struct drm_device *dev,
> u64 min_pitch = drm_format_info_min_pitch(info, i, width);
>
> if (!block_size && (r->modifier[i] == DRM_FORMAT_MOD_LINEAR)) {
> - DRM_DEBUG_KMS("Format requires non-linear modifier for plane %d\n", i);
> + drm_dbg_kms(dev, "Format requires non-linear modifier for plane %d\n", i);
> return -EINVAL;
> }
>
> if (!r->handles[i]) {
> - DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i);
> + drm_dbg_kms(dev, "no buffer object handle for plane %d\n", i);
> return -EINVAL;
> }
>
> @@ -218,20 +218,20 @@ static int framebuffer_check(struct drm_device *dev,
> return -ERANGE;
>
> if (block_size && r->pitches[i] < min_pitch) {
> - DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
> + drm_dbg_kms(dev, "bad pitch %u for plane %d\n", r->pitches[i], i);
> return -EINVAL;
> }
>
> if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {
> - DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n",
> - r->modifier[i], i);
> + drm_dbg_kms(dev, "bad fb modifier %llu for plane %d\n",
> + r->modifier[i], i);
> return -EINVAL;
> }
>
> if (r->flags & DRM_MODE_FB_MODIFIERS &&
> r->modifier[i] != r->modifier[0]) {
> - DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n",
> - r->modifier[i], i);
> + drm_dbg_kms(dev, "bad fb modifier %llu for plane %d\n",
> + r->modifier[i], i);
> return -EINVAL;
> }
>
> @@ -244,7 +244,7 @@ static int framebuffer_check(struct drm_device *dev,
> if (r->pixel_format != DRM_FORMAT_NV12 ||
> width % 128 || height % 32 ||
> r->pitches[i] % 128) {
> - DRM_DEBUG_KMS("bad modifier data for plane %d\n", i);
> + drm_dbg_kms(dev, "bad modifier data for plane %d\n", i);
> return -EINVAL;
> }
> break;
> @@ -256,7 +256,7 @@ static int framebuffer_check(struct drm_device *dev,
>
> for (i = info->num_planes; i < 4; i++) {
> if (r->modifier[i]) {
> - DRM_DEBUG_KMS("non-zero modifier for unused plane %d\n", i);
> + drm_dbg_kms(dev, "non-zero modifier for unused plane %d\n", i);
> return -EINVAL;
> }
>
> @@ -265,17 +265,17 @@ static int framebuffer_check(struct drm_device *dev,
> continue;
>
> if (r->handles[i]) {
> - DRM_DEBUG_KMS("buffer object handle for unused plane %d\n", i);
> + drm_dbg_kms(dev, "buffer object handle for unused plane %d\n", i);
> return -EINVAL;
> }
>
> if (r->pitches[i]) {
> - DRM_DEBUG_KMS("non-zero pitch for unused plane %d\n", i);
> + drm_dbg_kms(dev, "non-zero pitch for unused plane %d\n", i);
> return -EINVAL;
> }
>
> if (r->offsets[i]) {
> - DRM_DEBUG_KMS("non-zero offset for unused plane %d\n", i);
> + drm_dbg_kms(dev, "non-zero offset for unused plane %d\n", i);
> return -EINVAL;
> }
> }
> @@ -293,24 +293,24 @@ drm_internal_framebuffer_create(struct drm_device *dev,
> int ret;
>
> if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) {
> - DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags);
> + drm_dbg_kms(dev, "bad framebuffer flags 0x%08x\n", r->flags);
> return ERR_PTR(-EINVAL);
> }
>
> if ((config->min_width > r->width) || (r->width > config->max_width)) {
> - DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n",
> - r->width, config->min_width, config->max_width);
> + drm_dbg_kms(dev, "bad framebuffer width %d, should be >= %d && <= %d\n",
> + r->width, config->min_width, config->max_width);
> return ERR_PTR(-EINVAL);
> }
> if ((config->min_height > r->height) || (r->height > config->max_height)) {
> - DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n",
> - r->height, config->min_height, config->max_height);
> + drm_dbg_kms(dev, "bad framebuffer height %d, should be >= %d && <= %d\n",
> + r->height, config->min_height, config->max_height);
> return ERR_PTR(-EINVAL);
> }
>
> if (r->flags & DRM_MODE_FB_MODIFIERS &&
> dev->mode_config.fb_modifiers_not_supported) {
> - DRM_DEBUG_KMS("driver does not support fb modifiers\n");
> + drm_dbg_kms(dev, "driver does not support fb modifiers\n");
> return ERR_PTR(-EINVAL);
> }
>
> @@ -320,7 +320,7 @@ drm_internal_framebuffer_create(struct drm_device *dev,
>
> fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);
> if (IS_ERR(fb)) {
> - DRM_DEBUG_KMS("could not create framebuffer\n");
> + drm_dbg_kms(dev, "could not create framebuffer\n");
> return fb;
> }
>
> @@ -356,7 +356,7 @@ int drm_mode_addfb2(struct drm_device *dev,
> if (IS_ERR(fb))
> return PTR_ERR(fb);
>
> - DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id);
> + drm_dbg_kms(dev, "[FB:%d]\n", fb->base.id);
> r->fb_id = fb->base.id;
>
> /* Transfer ownership to the filp for reaping on close */
> @@ -384,7 +384,7 @@ int drm_mode_addfb2_ioctl(struct drm_device *dev,
> * then. So block it to make userspace fallback to
> * ADDFB.
> */
> - DRM_DEBUG_KMS("addfb2 broken on bigendian");
> + drm_dbg_kms(dev, "addfb2 broken on bigendian");
> return -EOPNOTSUPP;
> }
> #endif
--
Jani Nikula, Intel Open Source Graphics Center
prev parent reply other threads:[~2022-09-05 11:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 10:36 [PATCH] drm/framebuffer: convert to drm_dbg_kms() Simon Ser
2022-09-05 11:12 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jxmaxd5.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=contact@emersion.fr \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.