Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307207
b: refs/heads/master
c: 1aa1b11
h: refs/heads/master
i:
  307205: 69ed4a2
  307203: 3cce8d5
  307199: 34b6bcc
v: v3
  • Loading branch information
Dave Airlie committed May 2, 2012
1 parent a49ae34 commit 37263ff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5bc69bf9aeb73547cad8e1ce683a103fe9728282
refs/heads/master: 1aa1b11c57a69fc483218794172f660d74882944
18 changes: 9 additions & 9 deletions trunk/drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand All @@ -2202,25 +2202,25 @@ 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;
}

for (i = 0; i < num_planes; i++) {
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;
}
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit 37263ff

Please sign in to comment.