From 37263ffe38f846b85f62df58efd2c60f6b7c7882 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 1 May 2012 17:38:35 +0100 Subject: [PATCH] --- yaml --- r: 307207 b: refs/heads/master c: 1aa1b11c57a69fc483218794172f660d74882944 h: refs/heads/master i: 307205: 69ed4a2171fdc66a750e53f9d5d6c3d8a65f70b3 307203: 3cce8d5a975826a43cb3d33f016d43dc79bf3ade 307199: 34b6bccf204df912c58382bf4947d07ae895238c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7f1788521fca..92930927b531 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bc69bf9aeb73547cad8e1ce683a103fe9728282 +refs/heads/master: 1aa1b11c57a69fc483218794172f660d74882944 diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c index a9ca1b80fc28..3519b6c174a9 100644 --- a/trunk/drivers/gpu/drm/drm_crtc.c +++ b/trunk/drivers/gpu/drm/drm_crtc.c @@ -2104,7 +2104,7 @@ int drm_mode_addfb(struct drm_device *dev, fb = dev->mode_config.funcs->fb_create(dev, file_priv, &r); if (IS_ERR(fb)) { - DRM_ERROR("could not create framebuffer\n"); + DRM_DEBUG_KMS("could not create framebuffer\n"); ret = PTR_ERR(fb); goto out; } @@ -2193,7 +2193,7 @@ static int framebuffer_check(struct drm_mode_fb_cmd2 *r) ret = format_check(r); if (ret) { - DRM_ERROR("bad framebuffer format 0x%08x\n", r->pixel_format); + DRM_DEBUG_KMS("bad framebuffer format 0x%08x\n", r->pixel_format); return ret; } @@ -2202,12 +2202,12 @@ static int framebuffer_check(struct drm_mode_fb_cmd2 *r) num_planes = drm_format_num_planes(r->pixel_format); if (r->width == 0 || r->width % hsub) { - DRM_ERROR("bad framebuffer width %u\n", r->height); + DRM_DEBUG_KMS("bad framebuffer width %u\n", r->height); return -EINVAL; } if (r->height == 0 || r->height % vsub) { - DRM_ERROR("bad framebuffer height %u\n", r->height); + DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height); return -EINVAL; } @@ -2215,12 +2215,12 @@ static int framebuffer_check(struct drm_mode_fb_cmd2 *r) unsigned int width = r->width / (i != 0 ? hsub : 1); if (!r->handles[i]) { - DRM_ERROR("no buffer object handle for plane %d\n", i); + DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i); return -EINVAL; } if (r->pitches[i] < drm_format_plane_cpp(r->pixel_format, i) * width) { - DRM_ERROR("bad pitch %u for plane %d\n", r->pitches[i], i); + DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i); return -EINVAL; } } @@ -2257,12 +2257,12 @@ int drm_mode_addfb2(struct drm_device *dev, return -EINVAL; if ((config->min_width > r->width) || (r->width > config->max_width)) { - DRM_ERROR("bad framebuffer width %d, should be >= %d && <= %d\n", + DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", r->width, config->min_width, config->max_width); return -EINVAL; } if ((config->min_height > r->height) || (r->height > config->max_height)) { - DRM_ERROR("bad framebuffer height %d, should be >= %d && <= %d\n", + DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n", r->height, config->min_height, config->max_height); return -EINVAL; } @@ -2275,7 +2275,7 @@ int drm_mode_addfb2(struct drm_device *dev, fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); if (IS_ERR(fb)) { - DRM_ERROR("could not create framebuffer\n"); + DRM_DEBUG_KMS("could not create framebuffer\n"); ret = PTR_ERR(fb); goto out; }