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

Commit 80e6e6b1 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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:
parents d808e62f 4e578080

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -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_POSITION_Y, info->var.yoffset);

		vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres);

		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_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);

		vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);

	}

	}