From: Dave Airlie Date: Mon, 4 Nov 2013 06:38:08 +0000 (+1000) Subject: qxl: avoid an oops in the deferred io code. X-Git-Tag: firefly_0821_release~6453^2~155 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb675efa409c853ca3464ad93c4cf5d8577ef5e0;p=firefly-linux-kernel-4.4.55.git qxl: avoid an oops in the deferred io code. commit cc87509d87696d7cd393882f5dedea01e03e41a9 upstream. 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. Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index b3c51275df5c..7002de79e5da 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -91,7 +91,7 @@ static void qxl_fb_dirty_flush(struct fb_info *info) u32 x1, x2, y1, y2; /* TODO: hard coding 32 bpp */ - int stride = qfbdev->qfb.base.pitches[0] * 4; + int stride = qfbdev->qfb.base.pitches[0]; x1 = qfbdev->dirty.x1; x2 = qfbdev->dirty.x2;