From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Date: Sun, 19 Aug 2018 10:26:28 +0000 Subject: Re: [PATCH] mach64: fix console corruption in 24bpp mode Message-Id: <20180819102628.GA11867@sci.fi> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Mikulas Patocka Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz On Fri, Aug 17, 2018 at 03:15:52PM -0400, Mikulas Patocka wrote: > There's console font corruption when using the mach64 driver in 24bpp > mode. >=20 > 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. Hmm. I would think it should work just fine since we feed in each bit three times and the hw 24bpp rotate thing should take care of selecting the right component. - if (M64_HAS(HW_TRIPLE) && image->width % 8 =3D 0) + if (M64_HAS(HW_TRIPLE) && width % 8 =3D 0) pix_width |=3D DP_HOST_TRIPLE_EN; perhaps? > Signed-off-by: Mikulas Patocka > Cc: stable@vger.kernel.org >=20 > --- > drivers/video/fbdev/aty/mach64_accel.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > Index: linux-stable/drivers/video/fbdev/aty/mach64_accel.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D> --- 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 !=3D 1 && info->var.bits_per_pixel !=3D image->depth)= ) { > + (image->depth !=3D 1 && info->var.bits_per_pixel !=3D image->depth)= || > + (image->depth =3D 1 && info->var.bits_per_pixel =3D 24)) { > cfb_imageblit(info, image); > return; > } > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel --=20 Ville Syrj=E4l=E4 syrjala@sci.fi http://www.sci.fi/~syrjala/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] mach64: fix console corruption in 24bpp mode Date: Sun, 19 Aug 2018 13:26:28 +0300 Message-ID: <20180819102628.GA11867@sci.fi> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from welho-filter4.welho.com (welho-filter4.welho.com [83.102.41.26]) by gabe.freedesktop.org (Postfix) with ESMTPS id 812EC89D42 for ; Sun, 19 Aug 2018 10:33:26 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mikulas Patocka Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBBdWcgMTcsIDIwMTggYXQgMDM6MTU6NTJQTSAtMDQwMCwgTWlrdWxhcyBQYXRvY2th IHdyb3RlOgo+IFRoZXJlJ3MgY29uc29sZSBmb250IGNvcnJ1cHRpb24gd2hlbiB1c2luZyB0aGUg bWFjaDY0IGRyaXZlciBpbiAyNGJwcAo+IG1vZGUuCj4gCj4gSW4gMjRicHAgbW9kZSwgdGhlIG1h Y2g2NCBhY2NlbGVyYXRvciBpcyBzZXQgdXAgZm9yIDgtYnBwIG1vZGUgKHdpdGgKPiBob3Jpem9u dGFsIHdpZHRoIGFuZCBzdHJpZGUgbXVsdGlwbGllZCBieSAzKS4gSW4gdGhpcyBtb2RlLCB0aGUK PiBhY2NlbGVyYXRvciBjYW4ndCBldmVuIHBvc3NpYmx5IHN1cHBvcnQgY29sb3IgZXhwYW5zaW9u LiBDb25zcXVlbnRseSwgd2UKPiBoYXZlIHRvIHVzZSBhbiB1bmFjY2VsZXJhdGVkIGZ1bmN0aW9u IGNmYl9pbWFnZWJsaXQgZm9yIGNvbG9yIGV4cGFuc2lvbi4KCkhtbS4gSSB3b3VsZCB0aGluayBp dCBzaG91bGQgd29yayBqdXN0IGZpbmUgc2luY2Ugd2UgZmVlZCBpbiBlYWNoIGJpdAp0aHJlZSB0 aW1lcyBhbmQgdGhlIGh3IDI0YnBwIHJvdGF0ZSB0aGluZyBzaG91bGQgdGFrZSBjYXJlIG9mIHNl bGVjdGluZwp0aGUgcmlnaHQgY29tcG9uZW50LgoKLSAgICAgICAgICAgICAgIGlmIChNNjRfSEFT KEhXX1RSSVBMRSkgJiYgaW1hZ2UtPndpZHRoICUgOCA9PSAwKQorICAgICAgICAgICAgICAgaWYg KE02NF9IQVMoSFdfVFJJUExFKSAmJiB3aWR0aCAlIDggPT0gMCkKCQkgICAgICAgICAgICAgICAg ICAgICAgICBwaXhfd2lkdGggfD0gRFBfSE9TVF9UUklQTEVfRU47CnBlcmhhcHM/Cgo+IFNpZ25l ZC1vZmYtYnk6IE1pa3VsYXMgUGF0b2NrYSA8bXBhdG9ja2FAcmVkaGF0LmNvbT4KPiBDYzogc3Rh YmxlQHZnZXIua2VybmVsLm9yZwo+IAo+IC0tLQo+ICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2F0eS9t YWNoNjRfYWNjZWwuYyB8ICAgIDMgKystCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKPiAKPiBJbmRleDogbGludXgtc3RhYmxlL2RyaXZlcnMvdmlkZW8v ZmJkZXYvYXR5L21hY2g2NF9hY2NlbC5jCj4gPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQo+IC0tLSBsaW51eC1zdGFibGUu b3JpZy9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2F0eS9tYWNoNjRfYWNjZWwuYwkyMDE4LTA0LTIwIDE4 OjExOjAxLjAwMDAwMDAwMCArMDIwMAo+ICsrKyBsaW51eC1zdGFibGUvZHJpdmVycy92aWRlby9m YmRldi9hdHkvbWFjaDY0X2FjY2VsLmMJMjAxOC0wOC0xMyAxNzozNzowNC4wMDAwMDAwMDAgKzAy MDAKPiBAQCAtMjkxLDcgKzI5MSw4IEBAIHZvaWQgYXR5ZmJfaW1hZ2VibGl0KHN0cnVjdCBmYl9p bmZvICppbmYKPiAgCWlmICghaW1hZ2UtPndpZHRoIHx8ICFpbWFnZS0+aGVpZ2h0KQo+ICAJCXJl dHVybjsKPiAgCWlmICghcGFyLT5hY2NlbF9mbGFncyB8fAo+IC0JICAgIChpbWFnZS0+ZGVwdGgg IT0gMSAmJiBpbmZvLT52YXIuYml0c19wZXJfcGl4ZWwgIT0gaW1hZ2UtPmRlcHRoKSkgewo+ICsJ ICAgIChpbWFnZS0+ZGVwdGggIT0gMSAmJiBpbmZvLT52YXIuYml0c19wZXJfcGl4ZWwgIT0gaW1h Z2UtPmRlcHRoKSB8fAo+ICsJICAgIChpbWFnZS0+ZGVwdGggPT0gMSAmJiBpbmZvLT52YXIuYml0 c19wZXJfcGl4ZWwgPT0gMjQpKSB7Cj4gIAkJY2ZiX2ltYWdlYmxpdChpbmZvLCBpbWFnZSk7Cj4g IAkJcmV0dXJuOwo+ICAJfQo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAoKLS0gClZpbGxlIFN5cmrDpGzDpApzeXJqYWxhQHNjaS5maQpodHRwOi8v d3d3LnNjaS5maS9+c3lyamFsYS8KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==