From: Dave Airlie Date: Mon, 20 Jan 2020 01:08:11 +0000 (+1000) Subject: Backmerge v5.5-rc7 into drm-next X-Git-Tag: v5.6-rc1~114^2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d4743131b8de970faa4b979ead0fadfe5d2de9d;p=users%2Fjedix%2Flinux-maple.git Backmerge v5.5-rc7 into drm-next msm needs 5.5-rc4, go to the latest. Signed-off-by: Dave Airlie --- 3d4743131b8de970faa4b979ead0fadfe5d2de9d diff --cc drivers/gpu/drm/drm_fb_helper.c index 57f510687b85,d8e8f3960f4d..4c7cbce7bae7 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@@ -1267,10 -1283,10 +1267,10 @@@ int drm_fb_helper_check_var(struct fb_v * Changes struct fb_var_screeninfo are currently not pushed back * to KMS, hence fail if different settings are requested. */ - if (var->bits_per_pixel != fb->format->cpp[0] * 8 || + if (var->bits_per_pixel > fb->format->cpp[0] * 8 || var->xres > fb->width || var->yres > fb->height || var->xres_virtual > fb->width || var->yres_virtual > fb->height) { - DRM_DEBUG("fb requested width/height/bpp can't fit in current fb " + drm_dbg_kms(dev, "fb requested width/height/bpp can't fit in current fb " "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel, var->xres_virtual, var->yres_virtual,