From nobody Mon Dec 06 10:29:49 2021 X-Original-To: dev-commits-src-all@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 1D7D118B48EA; Mon, 6 Dec 2021 10:29:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J706k2QL3z4kHS; Mon, 6 Dec 2021 10:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EF28F1D9E; Mon, 6 Dec 2021 10:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B6ATn9m087455; Mon, 6 Dec 2021 10:29:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6ATnwI087454; Mon, 6 Dec 2021 10:29:49 GMT (envelope-from git) Date: Mon, 6 Dec 2021 10:29:49 GMT Message-Id: <202112061029.1B6ATnwI087454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: ca23e9d2ac2c - main - fb: Add new FBTYPE_EFIFB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca23e9d2ac2cd5443ab7d5b8999da11feddf828a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638786590; 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=G2iPnrVmdBC4WOdYn7BIJMjqfkdZ/V8nmitj0AVTo9A=; b=XHR3BkmnvrmI5MDf/OY1rTprtmJ5ROW8nitrCSOK2uNfrFSq2T8xGmAdkxmGzvmKlnUjIP VVB3T9mLakp5iy0xilnmYf30fxIfYi1AQfY2Pl1c5DNWGtEzROh94w+u2IfFoznafrk58s 82eXX14oRaGjyOWhtG/6CdPg+w7JquWEdxc28wkdsQYyVAZ1ei5RHTo39cNBxHVxs/QScr NnRppg31Re6bNw4co7kfa4nsz4VB5wGe4M/W2Ee9uVqHyT+HdQKQtuTCIRj3EjRLNIQBPF eH2YVw15bzdOheuq0k/+OmZtcQpn6JdSlKZUJkqbpG6gddIUV1Baq1uoskte3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638786590; a=rsa-sha256; cv=none; b=C4U4sAsPiISgKFr8ZzJGMtQ9X4R2WIBO1+TvNtTIuQXY9ZU5DWevYsyIMoTOO+/s7dG+C4 WqVdF0FFOfAR4jr84L3eW0KC+S+P6bCoSVexVBHb64L2JHpJzi2Vn46oBkZ3UHkzVMOu56 72p7NYTT5wTP4pfG2xQsLjmoMpHlfmqOTbbPnPQQvMkrwLUm0rr2n5wRX5AzYH8nxA3/wq WNwld/d77eivb58W0vT9qKvCv61kwkvN6+hpIgFJXoUo5MWV4P+erHStluAzwPdCykeAZR DRGtRaY4TuilsQModISvp4rLy04mrg/vU+4CAzJHj3oEY6qq9ITG7FN1iORABw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ca23e9d2ac2cd5443ab7d5b8999da11feddf828a commit ca23e9d2ac2cd5443ab7d5b8999da11feddf828a Author: Emmanuel Vadot AuthorDate: 2021-12-01 15:13:09 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-06 10:28:03 +0000 fb: Add new FBTYPE_EFIFB Currently the type isn't set in the fbtype struct so any userland program that call the FBIOGTYPE ioctl will think it's a FBTYPE_SUN1BW which is far from the truth. No app that I found find checks the type but at least now it's correct. Reviewed by: emaste, tsoome MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33221 --- sys/dev/vt/hw/efifb/efifb.c | 1 + sys/sys/fbio.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c index de361ea45b97..fd78e53bbaf7 100644 --- a/sys/dev/vt/hw/efifb/efifb.c +++ b/sys/dev/vt/hw/efifb/efifb.c @@ -117,6 +117,7 @@ vt_efifb_init(struct vt_device *vd) if (efifb == NULL) return (CN_DEAD); + info->fb_type = FBTYPE_EFIFB; info->fb_height = efifb->fb_height; info->fb_width = efifb->fb_width; diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index 38b544801573..194e08bbfb95 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -91,7 +91,9 @@ #define FBTYPE_TCXCOLOR 29 /* SUNW,tcx */ #define FBTYPE_CREATOR 30 -#define FBTYPE_LASTPLUSONE 31 /* max number of fbs (change as add) */ +#define FBTYPE_EFIFB 31 /* EFI Graphical Output Protocol (GOP) */ + +#define FBTYPE_LASTPLUSONE 32 /* max number of fbs (change as add) */ /* * Frame buffer descriptor as returned by FBIOGTYPE.