From nobody Mon Feb 6 01:24:16 2023 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 4P97p83qdxz3n4nw; Mon, 6 Feb 2023 01:24:16 +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 4P97p834W4z421h; Mon, 6 Feb 2023 01:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675646656; 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=yurez34lmh/asnOqBViQHkvMj0eGDv3M+XWY1maYbXI=; b=gPr10GVRMI0qidw8KaEuMAqH3MuS4fKGJibMo4cmpx0hbW9yx64H8g6Y6fEZdK75d2bXP7 oRHOOHk+vMoJYiJJ0a39NHMv8LMB/3mw12SkG6S2KrmnLZIzcFeTLKynnpXO8LtIkuQPbD pgf5FlsTVq9ojQF4AAeDfEGq7be6kep+KIu2bnUUJjzWt26RnvghH818qfWxidvvvng+gs TqgBxXeTHdiNBhQt/ZwDC3x9k4gKrtks28ICmgsu57ll0YFjeDpb4b+6d1aNM7+F/ex+9L uUgkfLOUytlr3RXDjzfvDIfciH0BsbgtXTikTAZ84YZf9xYp0AEMPT76ymeXXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675646656; 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=yurez34lmh/asnOqBViQHkvMj0eGDv3M+XWY1maYbXI=; b=fuk/5ajCXs57YtcuC0FSpRaxyI9QiEKj0VK3FwjLoVRSKUzWRwUcwEMRf9c4KvnLIYRIb1 xViHBKN+DT3UqI80HNzu33UGBtey0muHXCoK3FGW8jNBh8oDCk+lhdRIYqh5MlAE2ZFn7j PEDdzyB24PoFYR61qxIEdElze7WQ2vFXTicHP7aLMynpWeoKua8T305we6Yfk059CtgtKg oROPacL8BKwP5Qn+Z31AySfdLQ7hRMpG+UMNS03m6Tw+5mCFcIS6ur4iziVc7azEHhTr7b +SeZsil/xlgvSqRM/1cnAAnwu5UG36H4jEopx6JZXnWo71o5QjxauTD8djW0/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675646656; a=rsa-sha256; cv=none; b=OaIUFrl2K4O2tiuBuFvDD/yK3YYNauH9G69bIGfOpqhwt8PXI637+TjP8gYGOGvkiNzlCW FvedY22Z2T12ZpsnyyfulMoFUZ15izaaOiXOMoBF5tPcr9SCgNJ9A7tWwGp2THLkpaVltQ 491EUZtN7uxrQPLcdSjMC0/Ng2H+RHR8n7ABOQBFX9pyp2W1B3R6E7WPzp3oDQwQf8bHTs +P3Ui10skxu0zry+JI6J7KcrDBVyEbufyhaRWV1yRO4l/tYMuGPvdmvrj1aVTMtchyK1wl vUS+T7lDy4FwK70FeSO2AyeRXz9d13Zybh+i4GQfofUmVqA/5QNIaasr6M/e9Q== 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 4P97p821sbzGlt; Mon, 6 Feb 2023 01:24:16 +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 3161OGN4061344; Mon, 6 Feb 2023 01:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3161OGGQ061343; Mon, 6 Feb 2023 01:24:16 GMT (envelope-from git) Date: Mon, 6 Feb 2023 01:24:16 GMT Message-Id: <202302060124.3161OGGQ061343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 3cc3c1eb7961 - main - Skip EFI framebuffer information if there is none 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc3c1eb7961cf93306e0a0f79f3e2309f5b7011 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc3c1eb7961cf93306e0a0f79f3e2309f5b7011 commit 3cc3c1eb7961cf93306e0a0f79f3e2309f5b7011 Author: Simon J. Gerraty AuthorDate: 2023-02-06 01:23:09 +0000 Commit: Simon J. Gerraty CommitDate: 2023-02-06 01:23:09 +0000 Skip EFI framebuffer information if there is none Avoid several lines of useless info if there is no EFI framebuffer Reviewed by: stevek, imp Differential Revision: https://reviews.freebsd.org/D38393 --- stand/efi/loader/bootinfo.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 01f7506710bf..939f2cf4c3fe 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -194,16 +194,19 @@ bi_load_efi_data(struct preloaded_file *kfp, bool exit_bs) efifb.fb_mask_blue = gfx_state.tg_fb.fb_mask_blue; efifb.fb_mask_reserved = gfx_state.tg_fb.fb_mask_reserved; - printf("EFI framebuffer information:\n"); - printf("addr, size 0x%jx, 0x%jx\n", efifb.fb_addr, efifb.fb_size); - printf("dimensions %d x %d\n", efifb.fb_width, efifb.fb_height); - printf("stride %d\n", efifb.fb_stride); - printf("masks 0x%08x, 0x%08x, 0x%08x, 0x%08x\n", - efifb.fb_mask_red, efifb.fb_mask_green, efifb.fb_mask_blue, - efifb.fb_mask_reserved); - - if (efifb.fb_addr != 0) + if (efifb.fb_addr != 0) { + printf("EFI framebuffer information:\n"); + printf("addr, size 0x%jx, 0x%jx\n", + efifb.fb_addr, efifb.fb_size); + printf("dimensions %d x %d\n", + efifb.fb_width, efifb.fb_height); + printf("stride %d\n", efifb.fb_stride); + printf("masks 0x%08x, 0x%08x, 0x%08x, 0x%08x\n", + efifb.fb_mask_red, efifb.fb_mask_green, efifb.fb_mask_blue, + efifb.fb_mask_reserved); + file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); + } #endif do_vmap = true;