aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-11-04 01:38:08 -0500
committerDave Airlie <airlied@redhat.com>2013-11-04 01:48:43 -0500
commitcc87509d87696d7cd393882f5dedea01e03e41a9 (patch)
tree13b2757c36756d826531d700a35a54d8ee31fc2c
parent9d6104e0174b130ed864571b31811c3fd09fd611 (diff)
qxl: avoid an oops in the deferred io code.
If we are using deferred io due to plymouth or X.org fbdev driver we will oops in memcpy due to this pointless multiply here, removing it fixes fbdev to start and not oops. Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/qxl/qxl_fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 88722f233430..f437b30ce689 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -108,7 +108,7 @@ static void qxl_fb_dirty_flush(struct fb_info *info)
108 u32 x1, x2, y1, y2; 108 u32 x1, x2, y1, y2;
109 109
110 /* TODO: hard coding 32 bpp */ 110 /* TODO: hard coding 32 bpp */
111 int stride = qfbdev->qfb.base.pitches[0] * 4; 111 int stride = qfbdev->qfb.base.pitches[0];
112 112
113 x1 = qfbdev->dirty.x1; 113 x1 = qfbdev->dirty.x1;
114 x2 = qfbdev->dirty.x2; 114 x2 = qfbdev->dirty.x2;