diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-08 13:29:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-08 13:29:41 +1000 |
| commit | a3a06cb6c207a5612fa9753e2453bbcb3f5a256d (patch) | |
| tree | 3fe1ad92723491907bb4d39d9c392ec8f228dd9c /drivers/gpu/drm/drm_fb_helper.c | |
| parent | a81406b4143ff07e586bbe03c50f089da94eefe1 (diff) | |
| parent | 7751b8cb754f1bc48b20c1145d43c7651d4951fd (diff) | |
Merge remote branch 'korg/drm-core-next' into drm-testing
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 100ee48760b..1c2b7d44ec0 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -606,11 +606,10 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, return -EINVAL; /* Need to resize the fb object !!! */ - if (var->xres > fb->width || var->yres > fb->height) { - DRM_ERROR("Requested width/height is greater than current fb " - "object %dx%d > %dx%d\n", var->xres, var->yres, - fb->width, fb->height); - DRM_ERROR("Need resizing code.\n"); + if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height) { + DRM_DEBUG("fb userspace requested width/height/bpp is greater than current fb " + "object %dx%d-%d > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel, + fb->width, fb->height, fb->bits_per_pixel); return -EINVAL; } |