diff options
| author | Dave Airlie | 2014-07-05 23:49:28 +0200 |
|---|---|---|
| committer | Dave Airlie | 2014-07-05 23:49:28 +0200 |
| commit | 80e6e6b1764023ac1fba41e22a8503245b0fa573 (patch) | |
| tree | fe5e8b045abccaf69bcdc01e7521605e1a46b60b | |
| parent | Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox (diff) | |
| parent | drm/vmwgfx: Fix incorrect write to read-only register v2: (diff) | |
| download | kernel-qcow2-linux-80e6e6b1764023ac1fba41e22a8503245b0fa573.tar.gz kernel-qcow2-linux-80e6e6b1764023ac1fba41e22a8503245b0fa573.tar.xz kernel-qcow2-linux-80e6e6b1764023ac1fba41e22a8503245b0fa573.zip | |
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:
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index a89ad938eacf..b031b48dbb3c 100644 --- 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); } |