Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f505a5c0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 8201f1e8 12ffed96

drivers/gpu/drm/drm_fb_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -1260,9 +1260,9 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, 
	 * to KMS, hence fail if different settings are requested.

	 */

	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 userspace requested width/height/bpp different than current fb "

	    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 "

			  "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,