Skip to content

L
linux
Commit 019d157e authored by Simon Ser's avatar Simon Ser
Browse files
Options

drm/framebuffer: convert to drm_dbg_kms() 

Replace DRM_DEBUG_KMS() with drm_dbg_kms() which allows specifying
the DRM device to provide more context.
Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220905103559.118561-1-contact@emersion.fr
parent 45eb009f
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
drivers/gpu/drm/drm_framebuffer.c
View file @ 019d157e
...@@ -87,13 +87,13 @@ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y, ...@@ -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_x > fb_width - src_w ||
src_h > fb_height || src_h > fb_height ||
src_y > fb_height - src_h) { src_y > fb_height - src_h) {
DRM_DEBUG_KMS("Invalid source coordinates " drm_dbg_kms(fb->dev, "Invalid source coordinates "
"%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n", "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n",
src_w >> 16, ((src_w & 0xffff) * 15625) >> 10, src_w >> 16, ((src_w & 0xffff) * 15625) >> 10,
src_h >> 16, ((src_h & 0xffff) * 15625) >> 10, src_h >> 16, ((src_h & 0xffff) * 15625) >> 10,
src_x >> 16, ((src_x & 0xffff) * 15625) >> 10, src_x >> 16, ((src_x & 0xffff) * 15625) >> 10,
src_y >> 16, ((src_y & 0xffff) * 15625) >> 10, src_y >> 16, ((src_y & 0xffff) * 15625) >> 10,
fb->width, fb->height); fb->width, fb->height);
return -ENOSPC; return -ENOSPC;
} }
...@@ -125,7 +125,7 @@ int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or, ...@@ -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); r.pixel_format = drm_driver_legacy_fb_format(dev, or->bpp, or->depth);
if (r.pixel_format == DRM_FORMAT_INVALID) { 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; return -EINVAL;
} }
...@@ -177,18 +177,18 @@ static int framebuffer_check(struct drm_device *dev, ...@@ -177,18 +177,18 @@ static int framebuffer_check(struct drm_device *dev,
/* check if the format is supported at all */ /* check if the format is supported at all */
if (!__drm_format_info(r->pixel_format)) { if (!__drm_format_info(r->pixel_format)) {
DRM_DEBUG_KMS("bad framebuffer format %p4cc\n", drm_dbg_kms(dev, "bad framebuffer format %p4cc\n",
&r->pixel_format); &r->pixel_format);
return -EINVAL; return -EINVAL;
} }
if (r->width == 0) { 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; return -EINVAL;
} }
if (r->height == 0) { 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; return -EINVAL;
} }
...@@ -202,12 +202,12 @@ static int framebuffer_check(struct drm_device *dev, ...@@ -202,12 +202,12 @@ static int framebuffer_check(struct drm_device *dev,
u64 min_pitch = drm_format_info_min_pitch(info, i, width); u64 min_pitch = drm_format_info_min_pitch(info, i, width);
if (!block_size && (r->modifier[i] == DRM_FORMAT_MOD_LINEAR)) { 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; return -EINVAL;
} }
if (!r->handles[i]) { 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; return -EINVAL;
} }
...@@ -218,20 +218,20 @@ static int framebuffer_check(struct drm_device *dev, ...@@ -218,20 +218,20 @@ static int framebuffer_check(struct drm_device *dev,
return -ERANGE; return -ERANGE;
if (block_size && r->pitches[i] < min_pitch) { 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; return -EINVAL;
} }
if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {
DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n", drm_dbg_kms(dev, "bad fb modifier %llu for plane %d\n",
r->modifier[i], i); r->modifier[i], i);
return -EINVAL; return -EINVAL;
} }
if (r->flags & DRM_MODE_FB_MODIFIERS && if (r->flags & DRM_MODE_FB_MODIFIERS &&
r->modifier[i] != r->modifier[0]) { r->modifier[i] != r->modifier[0]) {
DRM_DEBUG_KMS("bad fb modifier %llu for plane %d\n", drm_dbg_kms(dev, "bad fb modifier %llu for plane %d\n",
r->modifier[i], i); r->modifier[i], i);
return -EINVAL; return -EINVAL;
} }
...@@ -244,7 +244,7 @@ static int framebuffer_check(struct drm_device *dev, ...@@ -244,7 +244,7 @@ static int framebuffer_check(struct drm_device *dev,
if (r->pixel_format != DRM_FORMAT_NV12 || if (r->pixel_format != DRM_FORMAT_NV12 ||
width % 128 || height % 32 || width % 128 || height % 32 ||
r->pitches[i] % 128) { 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; return -EINVAL;
} }
break; break;
...@@ -256,7 +256,7 @@ static int framebuffer_check(struct drm_device *dev, ...@@ -256,7 +256,7 @@ static int framebuffer_check(struct drm_device *dev,
for (i = info->num_planes; i < 4; i++) { for (i = info->num_planes; i < 4; i++) {
if (r->modifier[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; return -EINVAL;
} }
...@@ -265,17 +265,17 @@ static int framebuffer_check(struct drm_device *dev, ...@@ -265,17 +265,17 @@ static int framebuffer_check(struct drm_device *dev,
continue; continue;
if (r->handles[i]) { 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; return -EINVAL;
} }
if (r->pitches[i]) { 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; return -EINVAL;
} }
if (r->offsets[i]) { 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; return -EINVAL;
} }
} }
...@@ -293,24 +293,24 @@ drm_internal_framebuffer_create(struct drm_device *dev, ...@@ -293,24 +293,24 @@ drm_internal_framebuffer_create(struct drm_device *dev,
int ret; int ret;
if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { 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); return ERR_PTR(-EINVAL);
} }
if ((config->min_width > r->width) || (r->width > config->max_width)) { if ((config->min_width > r->width) || (r->width > config->max_width)) {
DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", drm_dbg_kms(dev, "bad framebuffer width %d, should be >= %d && <= %d\n",
r->width, config->min_width, config->max_width); r->width, config->min_width, config->max_width);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
if ((config->min_height > r->height) || (r->height > config->max_height)) { if ((config->min_height > r->height) || (r->height > config->max_height)) {
DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n", drm_dbg_kms(dev, "bad framebuffer height %d, should be >= %d && <= %d\n",
r->height, config->min_height, config->max_height); r->height, config->min_height, config->max_height);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
if (r->flags & DRM_MODE_FB_MODIFIERS && if (r->flags & DRM_MODE_FB_MODIFIERS &&
dev->mode_config.fb_modifiers_not_supported) { 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); return ERR_PTR(-EINVAL);
} }
...@@ -320,7 +320,7 @@ drm_internal_framebuffer_create(struct drm_device *dev, ...@@ -320,7 +320,7 @@ drm_internal_framebuffer_create(struct drm_device *dev,
fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);
if (IS_ERR(fb)) { if (IS_ERR(fb)) {
DRM_DEBUG_KMS("could not create framebuffer\n"); drm_dbg_kms(dev, "could not create framebuffer\n");
return fb; return fb;
} }
...@@ -356,7 +356,7 @@ int drm_mode_addfb2(struct drm_device *dev, ...@@ -356,7 +356,7 @@ int drm_mode_addfb2(struct drm_device *dev,
if (IS_ERR(fb)) if (IS_ERR(fb))
return PTR_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; r->fb_id = fb->base.id;
/* Transfer ownership to the filp for reaping on close */ /* Transfer ownership to the filp for reaping on close */
...@@ -384,7 +384,7 @@ int drm_mode_addfb2_ioctl(struct drm_device *dev, ...@@ -384,7 +384,7 @@ int drm_mode_addfb2_ioctl(struct drm_device *dev,
* then. So block it to make userspace fallback to * then. So block it to make userspace fallback to
* ADDFB. * ADDFB.
*/ */
DRM_DEBUG_KMS("addfb2 broken on bigendian"); drm_dbg_kms(dev, "addfb2 broken on bigendian");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7