From nobody Mon Jun 23 06:27:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bQdRf4yxwz5yrQm; Mon, 23 Jun 2025 06:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQdRf04YQz3gMr; Mon, 23 Jun 2025 06:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750660062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiJUVOYNSdlaRgeeKikjgMYdabZOX5k8fE7irCWCZxs=; b=Rk75SdOs+DuZWts4Y5r/eSaNKOdWvRBuTtUfaZsL2MT2VuRDGsi+gPVE07icD3zvKmKxO9 Zxa2/ej3+FJhnVAx8WmqboDWpQ1eDN7ISOmMIksatkSGWfcDwcu8MMqxFbAhTxMDWsUVAh ak4T2w59yy8Q2IVvI7f4pRyOPpv9L0IPmvEi024FaghmdxevRtlVqtZNHGxxgb24mVFq85 AnvvyItjUGeF55KZVcfd4Lwh90R8R5Pr78mT+oDa78zLTAD5u4f3bVPpdXlkTH66uRAcvu HK1oDh86Sj1PmtbvL4zv73bnKiEppruZaOnIBYwhOuoSy9WxxsM3MQWSNuBfIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750660062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiJUVOYNSdlaRgeeKikjgMYdabZOX5k8fE7irCWCZxs=; b=BHGzBkR7JXH18RuNIMi/dqNObiQ1bhK4UIkDz2DBXtedD/toDBkAM6bmhkQiSbvBNtpGKb VRjxkqCoO9TOslUuL/6a+W0XPCLsPFs/y7wT8Kx28C5OfLcDQIByhKgyn9pqN0YDPhxXF7 f1STOBCHol/YhUTtXUlif8vO75gDkroD7VL2bhmS26UA1S7/w9dJw/jmW932EdWKGRrnSp deFnUHpWJSRx4cw3BdYaP4RqyPdQT2jvxijiLlG31vbr61TMah2hKRYbw6hZdNw6TfKLvp ZOtJt16C9XSioLexAl6AlF2LpMjZtyGwgI10PjuS29KbVJVZzoZ02bxfqt2OmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750660062; a=rsa-sha256; cv=none; b=V3GFlwO0PpXSEdgdM11DV88ME6Zg3VwXQtAYR5SwnGdAiKdJZ3YKXO9x8v35xsgSHtj0LE tkRFqSt2P0Iu7ts9mjy/lL6Lk0TaYK0aszlSKnqejoGRwgBLzSiH2iUNoDBseo46uaKhH/ ygUSdkRJFfIpVCB3B3UUzg1JnMxKcQa458Nyupi3u8HhWzj8vadcQ8LY9b0fufC4ZH5jJf gIEKmysI+mDADv2pUnRO95LG/nRcX+D9KjNXZsOBlgrslkjpisvbn0rCiKcNZ5snb/a4xn ZCm1fMj+QEZuouxMZNIrT1pzHSqEnSEaH+N3mfRpP5oudCBlT+S7AoxqeZPDkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bQdRd6Vjszrjx; Mon, 23 Jun 2025 06:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55N6RfDp017775; Mon, 23 Jun 2025 06:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N6RfDl017772; Mon, 23 Jun 2025 06:27:41 GMT (envelope-from git) Date: Mon, 23 Jun 2025 06:27:41 GMT Message-Id: <202506230627.55N6RfDl017772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: b2e0dfc808c1 - main - vt_fb: account for endianness List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2e0dfc808c16566d734e15477382ea2bc74853e Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e0dfc808c16566d734e15477382ea2bc74853e commit b2e0dfc808c16566d734e15477382ea2bc74853e Author: Ahmad Khalifa AuthorDate: 2025-06-23 04:39:21 +0000 Commit: Ahmad Khalifa CommitDate: 2025-06-23 06:23:21 +0000 vt_fb: account for endianness Account for endianness when writing to 24bpp framebuffers. Also create a vt_fb_mem_wr3 function to avoid code duplication. Reviewed by: manu, imp Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D50843 --- sys/dev/vt/hw/fb/vt_fb.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c index 151129208f27..6130dc4061b4 100644 --- a/sys/dev/vt/hw/fb/vt_fb.c +++ b/sys/dev/vt/hw/fb/vt_fb.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -78,6 +79,22 @@ vt_fb_mem_wr2(struct fb_info *sc, uint32_t o, uint16_t v) *(uint16_t *)(sc->fb_vbase + o) = v; } +static void +vt_fb_mem_wr3(struct fb_info *sc, uint32_t o, uint32_t v) +{ + uint8_t *b = (uint8_t *)sc->fb_vbase + o; + + KASSERT((o + 2 < sc->fb_size), ("Offset %#08x out of fb size", o + 2)); + /* + * We want to write three bytes, independent + * of endianness. Multiply _QUAD_LOWWORD and + * _QUAD_HIGHWORD by 2 to skip the middle byte. + */ + b[_QUAD_LOWWORD * 2] = v & 0xff; + b[1] = (v >> 8) & 0xff; + b[_QUAD_HIGHWORD * 2] = (v >> 16) & 0xff; +} + static void vt_fb_mem_wr4(struct fb_info *sc, uint32_t o, uint32_t v) { @@ -187,9 +204,7 @@ vt_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color) vt_fb_mem_wr2(info, o, c); break; case 3: - vt_fb_mem_wr1(info, o, (c >> 16) & 0xff); - vt_fb_mem_wr1(info, o + 1, (c >> 8) & 0xff); - vt_fb_mem_wr1(info, o + 2, c & 0xff); + vt_fb_mem_wr3(info, o, c); break; case 4: vt_fb_mem_wr4(info, o, c); @@ -246,12 +261,7 @@ vt_fb_blank(struct vt_device *vd, term_color_t color) case 3: for (h = 0; h < info->fb_height; h++) for (o = 0; o < info->fb_stride - 2; o += 3) { - vt_fb_mem_wr1(info, h*info->fb_stride + o, - (c >> 16) & 0xff); - vt_fb_mem_wr1(info, h*info->fb_stride + o + 1, - (c >> 8) & 0xff); - vt_fb_mem_wr1(info, h*info->fb_stride + o + 2, - c & 0xff); + vt_fb_mem_wr3(info, h*info->fb_stride + o, c); } break; case 4: @@ -317,10 +327,7 @@ vt_fb_bitblt_bitmap(struct vt_device *vd, const struct vt_window *vw, vt_fb_mem_wr2(info, o, cc); break; case 3: - /* Packed mode, so unaligned. Byte access. */ - vt_fb_mem_wr1(info, o, (cc >> 16) & 0xff); - vt_fb_mem_wr1(info, o + 1, (cc >> 8) & 0xff); - vt_fb_mem_wr1(info, o + 2, cc & 0xff); + vt_fb_mem_wr3(info, o, cc); break; case 4: vt_fb_mem_wr4(info, o, cc);