From nobody Tue Dec 21 09:21:48 2021 X-Original-To: dev-commits-src-branches@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 B2CC118F37B5; Tue, 21 Dec 2021 09:21:50 +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 4JJ9vK6h6xz4RZg; Tue, 21 Dec 2021 09:21:49 +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 055C2270E3; Tue, 21 Dec 2021 09:21: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 1BL9Lm6d092700; Tue, 21 Dec 2021 09:21:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL9LmkC092699; Tue, 21 Dec 2021 09:21:48 GMT (envelope-from git) Date: Tue, 21 Dec 2021 09:21:48 GMT Message-Id: <202112210921.1BL9LmkC092699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 6bd6344f139f - stable/13 - fb: Add new FBTYPE_EFIFB List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6bd6344f139fbc183fbe33a165faaf0ea4767d05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640078510; 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=KEKe0g7xudC/kAewSBiUnuSuxdcLSdgPnirdqumexLw=; b=qoRNFT9QfXTZtok8jU/o5s+9dUaxL7Kwlj6+FAVNVb9Kxg383sN4IjUKllkfr0hiRXl5dz tlCWTs8mg0w49z4vNV3En2HFc1o2Z4zqMDr/kGP88Qjy8/ObswJv5QmnWIjOAzdOqyy1Pz a0E0sw4VqrICrl/rAJ2jWxrjuULvpMIlWhf4oxCdUDrqmEaJyfaxcHD8RUHbGhV79mYJt2 Fq6HXuLV4GqWDnJf99nO6ov0hA85IRLmb6Z7mtJDQz6AN1uRBbImoLNvqA1xdeSJyGYywh rYhf6bpLhRCfvcF2FnU74NlqwLhp9ITB7Z+Fk93DKksGrd7bcV0Uf1rD1o6DuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640078510; a=rsa-sha256; cv=none; b=W5baj2QSbBLsR98LIzFOrMVK9TaVJJwgr5fsmeu1Ei406kkNJzXhqg1owP0v7bYDVbv0YQ 2t27KKat+hPDZVBSqCSoG9W3SOfVm8NP9PpitQ2JiTCClBVHR3Dok1CG0wtZSxhQ7yfW/J xm0CcEFuGZc0fJoly4ODZvuO7B0K48sMkNYbCp49z+f4cuEFt9Vs8MRLi/BhrJIZ4w8UVw yLkmva/KxiJHGWb2iEVPxJEsjANt710URi4N7iZOPpThujXsey1TOZTSebFlGMWRiex6nS XWwTcQjFbHNkehnfBZ9qTEvmj23Ra4/yUyQFwXsL6J+eA/4KGaNdyd31Yvu+Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd6344f139fbc183fbe33a165faaf0ea4767d05 commit 6bd6344f139fbc183fbe33a165faaf0ea4767d05 Author: Emmanuel Vadot AuthorDate: 2021-12-01 15:13:09 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-21 09:21:26 +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 (cherry picked from commit ca23e9d2ac2cd5443ab7d5b8999da11feddf828a) --- 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 fb270d438c81..3e1a793eee77 100644 --- a/sys/dev/vt/hw/efifb/efifb.c +++ b/sys/dev/vt/hw/efifb/efifb.c @@ -116,6 +116,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 1e04bc758134..931ef689fc1f 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.