From ecb106000517ae615295bda273f8d8bf2e1684c1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 8 Jan 2010 09:27:08 +1000 Subject: [PATCH] --- yaml --- r: 179851 b: refs/heads/master c: 7751b8cb754f1bc48b20c1145d43c7651d4951fd h: refs/heads/master i: 179849: 750547138ee7ff1f6dd63f1062c42dd1832d4f7a 179847: a81c011be0c0b8877e58c76a406fbde4218c7101 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f0bd3514b8be..4da50bfa5eda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 992dc9ae61f86db3b8ef9f8d6b7df898c90e8c08 +refs/heads/master: 7751b8cb754f1bc48b20c1145d43c7651d4951fd diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c index 100ee48760b7..1c2b7d44ec05 100644 --- a/trunk/drivers/gpu/drm/drm_fb_helper.c +++ b/trunk/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; }