Skip to content

Commit f505a5c

Browse files
committed
Merge tag 'drm-misc-fixes-2017-03-23' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
One fbdev regression fix from Michel * tag 'drm-misc-fixes-2017-03-23' of git://anongit.freedesktop.org/git/drm-misc: drm/fb-helper: Allow var->x/yres(_virtual) < fb->width/height again
2 parents 8201f1e + 12ffed9 commit f505a5c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/drm_fb_helper.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,9 +1260,9 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
12601260
* to KMS, hence fail if different settings are requested.
12611261
*/
12621262
if (var->bits_per_pixel != fb->format->cpp[0] * 8 ||
1263-
var->xres != fb->width || var->yres != fb->height ||
1264-
var->xres_virtual != fb->width || var->yres_virtual != fb->height) {
1265-
DRM_DEBUG("fb userspace requested width/height/bpp different than current fb "
1263+
var->xres > fb->width || var->yres > fb->height ||
1264+
var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
1265+
DRM_DEBUG("fb requested width/height/bpp can't fit in current fb "
12661266
"request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
12671267
var->xres, var->yres, var->bits_per_pixel,
12681268
var->xres_virtual, var->yres_virtual,

0 commit comments

Comments
 (0)