Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id EDF621A9241 for ; Sat, 18 Jul 2020 17:37:09 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4B24D84D65; Sat, 18 Jul 2020 17:37:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C23D484D62 for ; Sat, 18 Jul 2020 17:37:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0p8tG-aA6Hsv for ; Sat, 18 Jul 2020 17:37:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 52E5A84CD8 for ; Sat, 18 Jul 2020 17:37:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F95BFB28; Sat, 18 Jul 2020 17:37:08 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sat, 18 Jul 2020 17:37:08 +0000 From: "Izumi Tsutsui" Subject: CVS commit: xsrc/external/mit/xorg-server/dist/fb To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20200718173708.3F95BFB28@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Izumi Tsutsui" Mail-Followup-To: source-changes-d@NetBSD.org List-Unsubscribe: Module Name: xsrc Committed By: tsutsui Date: Sat Jul 18 17:37:08 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/dist/fb: fb.h fbcmap_mi.c fbscreen.c Log Message: Pull 1bpp server fixes from xorg-server.old: https://mail-index.netbsd.org/source-changes/2020/07/18/msg119488.html > Fix 1bpp Xservers on "whitePixel=0, blackPixel=1" VRAMs. > > - Don't override pScreen->blackPixel and pScreen->whitePixel > (set in MD server Init functions per -filpPixels option) > on 1bpp servers in merged fbSetupScreen() (merged one > from cfbSetupScrenn and mfbSetupScreen() in old xsrc/xfree) > - Pull mfbCreateColormap() function from old xsrc/xfree tree > and use it on 1bpp servers Confirmed on luna68k 1bpp Xorg 1.20 server using xf86-video-wsfb with "-flipPixels" option. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xorg-server/dist/fb/fb.h \ xsrc/external/mit/xorg-server/dist/fb/fbscreen.c cvs rdiff -u -r1.1.1.5 -r1.2 \ xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.