Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c82b88d5 authored by Marcin Kościelnicki's avatar Marcin Kościelnicki Committed by Ben Skeggs
Browse files

drm/nouveau: Fix fbcon corruption with font width not divisible by 8 



NV50 is nice and has a switch that autoaligns stuff for us. Pre-NV50,
we need to align input bitmap width manually.

Signed-off-by: default avatarMarcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 37000d27

drivers/gpu/drm/nouveau/nv04_fbcon.c

+3 −3
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) 
		return;

	}



	width = ALIGN(image->width, 32);

	dsize = (width * image->height) >> 5;

	width = ALIGN(image->width, 8);

	dsize = ALIGN(width * image->height, 32) >> 5;



	if (info->fix.visual == FB_VISUAL_TRUECOLOR ||

	    info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
@@ -136,8 +136,8 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) 
			 ((image->dx + image->width) & 0xffff));

	OUT_RING(chan, bg);

	OUT_RING(chan, fg);

	OUT_RING(chan, (image->height << 16) | image->width);

	OUT_RING(chan, (image->height << 16) | width);

	OUT_RING(chan, (image->height << 16) | image->width);

	OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff));



	while (dsize) {

drivers/gpu/drm/nouveau/nv50_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ nv50_fbcon_accel_init(struct fb_info *info) 
	BEGIN_RING(chan, NvSub2D, 0x0808, 3);

	OUT_RING(chan, 0);

	OUT_RING(chan, 0);

	OUT_RING(chan, 0);

	OUT_RING(chan, 1);

	BEGIN_RING(chan, NvSub2D, 0x081c, 1);

	OUT_RING(chan, 1);

	BEGIN_RING(chan, NvSub2D, 0x0840, 4);