--- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c.orig.orig	2014-06-30 00:04:16.953481974 +0100
+++ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c	2014-07-02 13:54:01.282674996 +0100
@@ -95,6 +95,8 @@
 static int vmw_fb_check_var(struct fb_var_screeninfo *var,
 			    struct fb_info *info)
 {
+  printk( KERN_INFO "fb_fix_screeninfo.line_length CODE PATH TRAVERSED\n" );
+
 	int depth = var->bits_per_pixel;
 	struct vmw_fb_par *par = info->par;
 	struct vmw_private *vmw_priv = par->vmw_priv;
@@ -147,7 +149,7 @@
 	}

 	if (!vmw_kms_validate_mode_vram(vmw_priv,
-          info->fix.line_length,
+					var->xres * var->bits_per_pixel/8,
 					var->yoffset + var->yres)) {
 		DRM_ERROR("Requested geom can not fit in framebuffer\n");
 		return -EINVAL;
@@ -162,6 +164,8 @@
 	struct vmw_private *vmw_priv = par->vmw_priv;
 	int ret;

+	info->fix.line_length = info->var.xres * info->var.bits_per_pixel/8;
+
 	ret = vmw_kms_write_svga(vmw_priv, info->var.xres, info->var.yres,
 				 info->fix.line_length,
 				 par->bpp, par->depth);
@@ -177,6 +181,7 @@
 		vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, info->var.yoffset);
 		vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres);
 		vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres);
+/*		vmw_write(vmw_priv, SVGA_REG_BYTES_PER_LINE, info->fix.line_length); */
 		vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);
 	}