1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 7740dd26f007..a0d6e894d97c 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -559,9 +559,13 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
                 return -EINVAL;
 
         /* Need to resize the fb object !!! */
-        if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height) {
+        if (var->bits_per_pixel > fb->bits_per_pixel ||
+            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 is greater than current fb "
-                          "object %dx%d-%d > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel,
+                          "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,
                           fb->width, fb->height, fb->bits_per_pixel);
                 return -EINVAL;
         }