Merge branch 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux

airlied · airlied · commit 80e6e6b17640 · 2014-07-06T07:49:28.000+10:00
fix to a 3.15 commit.

* 'vmwgfx-fixes-3.16' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix incorrect write to read-only register v2:
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -179,7 +179,6 @@ static int vmw_fb_set_par(struct fb_info *info)
 		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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ static int vmw_fb_set_par(struct fb_info *info)`
`179`	`179`	`vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, info->var.yoffset);`
`180`	`180`	`vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres);`
`181`	`181`	`vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres);`
`182`		`- vmw_write(vmw_priv, SVGA_REG_BYTES_PER_LINE, info->fix.line_length);`
`183`	`182`	`vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);`
`184`	`183`	`}`
`185`	`184`