[PATCH] mach64: fix console corruption in 24bpp mode

Mikulas Patocka mpatocka at redhat.com
Fri Aug 17 19:15:52 UTC 2018


There's console font corruption when using the mach64 driver in 24bpp
mode.

In 24bpp mode, the mach64 accelerator is set up for 8-bpp mode (with
horizontal width and stride multiplied by 3). In this mode, the
accelerator can't even possibly support color expansion. Consquently, we
have to use an unaccelerated function cfb_imageblit for color expansion.

Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Cc: stable at vger.kernel.org

---
 drivers/video/fbdev/aty/mach64_accel.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-stable/drivers/video/fbdev/aty/mach64_accel.c
===================================================================
--- linux-stable.orig/drivers/video/fbdev/aty/mach64_accel.c	2018-04-20 18:11:01.000000000 +0200
+++ linux-stable/drivers/video/fbdev/aty/mach64_accel.c	2018-08-13 17:37:04.000000000 +0200
@@ -291,7 +291,8 @@ void atyfb_imageblit(struct fb_info *inf
 	if (!image->width || !image->height)
 		return;
 	if (!par->accel_flags ||
-	    (image->depth != 1 && info->var.bits_per_pixel != image->depth)) {
+	    (image->depth != 1 && info->var.bits_per_pixel != image->depth) ||
+	    (image->depth == 1 && info->var.bits_per_pixel == 24)) {
 		cfb_imageblit(info, image);
 		return;
 	}


More information about the dri-devel mailing list