From: Greg Kroah-Hartman Date: Mon, 7 Jul 2014 18:34:50 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.4.98~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bc55b5c1a43a083dd90691d73f78f4eb3b5c1cf;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: drm-vmwgfx-fix-incorrect-write-to-read-only-register-v2.patch --- diff --git a/queue-3.10/drm-vmwgfx-fix-incorrect-write-to-read-only-register-v2.patch b/queue-3.10/drm-vmwgfx-fix-incorrect-write-to-read-only-register-v2.patch new file mode 100644 index 00000000000..d15275bd05f --- /dev/null +++ b/queue-3.10/drm-vmwgfx-fix-incorrect-write-to-read-only-register-v2.patch @@ -0,0 +1,39 @@ +From 4e578080ed3262ed2c3985868539bc66218d25c0 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom +Date: Wed, 2 Jul 2014 15:47:04 +0200 +Subject: drm/vmwgfx: Fix incorrect write to read-only register v2: + +From: Thomas Hellstrom + +commit 4e578080ed3262ed2c3985868539bc66218d25c0 upstream. + +Commit "drm/vmwgfx: correct fb_fix_screeninfo.line_length", while fixing a +vmwgfx fbdev bug, also writes the pitch to a supposedly read-only register: +SVGA_REG_BYTES_PER_LINE, while it should be (and also in fact is) written to +SVGA_REG_PITCHLOCK. + +This patch is Cc'd stable because of the unknown effects writing to this +register might have, particularly on older device versions. + +v2: Updated log message. + +Cc: Christopher Friedt +Tested-by: Christopher Friedt +Signed-off-by: Thomas Hellstrom +Reviewed-by: Jakob Bornecrantz +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 - + 1 file changed, 1 deletion(-) + +--- 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 + 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); + } + diff --git a/queue-3.10/series b/queue-3.10/series index 66a1aa64bb5..397a36636e0 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -17,3 +17,4 @@ drm-radeon-fix-typo-in-radeon_connector_is_dp12_capable.patch drm-radeon-dp-fix-lane-clock-setup-for-dp-1.2-capable-devices.patch drm-radeon-atom-fix-dithering-on-certain-panels.patch drm-radeon-don-t-allow-radeon_gem_domain_cpu-for-command-submission.patch +drm-vmwgfx-fix-incorrect-write-to-read-only-register-v2.patch