]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
qxl: avoid an oops in the deferred io code.
authorDave Airlie <airlied@redhat.com>
Mon, 4 Nov 2013 06:38:08 +0000 (16:38 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Dec 2013 19:05:38 +0000 (11:05 -0800)
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 <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/qxl/qxl_fb.c

index 88722f233430a3d0f7eb4e8b35ad929b709c5b35..f437b30ce6896736da893c2a8651ca23e0a1ed55 100644 (file)
@@ -108,7 +108,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;