From patchwork Wed Aug 4 10:22:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1513374 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ll4QHd2p; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GfnrW5f9Mz9sT6 for ; Wed, 4 Aug 2021 20:23:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 44F0F82E55; Wed, 4 Aug 2021 12:23:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ll4QHd2p"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 01BA582E4A; Wed, 4 Aug 2021 12:23:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 96B6382E04 for ; Wed, 4 Aug 2021 12:22:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pl1-x62f.google.com with SMTP id u2so2471202plg.10 for ; Wed, 04 Aug 2021 03:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zKRubqZnYx/JmQ+n0KDGIIktmrqsEZ/WxL0gZj1bEKg=; b=ll4QHd2pl1U9jhlpYS/MdUIahRoeBTV1NmrAParOa+qTW/V9uTua3Rst6/VyIRCHjL vMmLciW1nxBc3UJjZCuoRTGD4m3qaxEiqPGYbyPEhfOUPN6mUzyr9Tv9/CM88Q4t6/5J lEJym50MWRZ7eINMHP+7imXEtbdHxy5a2mFzok4gmjLhExm7UfzBbZfor7yFzBlcAip3 6ubPOL/2s34PAvr5Eg3h9i7KwXANtexjD/VxtdFJwr27lgWhCMoHvRHwJ7JZ5AQsssfa XKOB3In6i0DpgWaxw2NuCdNb/GvtXlUgMTzxiwxfe3NFKPN2TnUzDgzQqAXOeqwzEMzB jZwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zKRubqZnYx/JmQ+n0KDGIIktmrqsEZ/WxL0gZj1bEKg=; b=nYaP4aB7polJ8FaAk9BSsHfUNYntw1iCjMEaBCkmKhg+XjLxiUNPnvPDd72KDChOuO +8Yw7gwpvN8CG4BPNaqeImOxV0FFlAROMI9d9BAC9zi40+KgWztVHwmqdqxmfWjF8Eo0 CcPThdVPKcEpoQ6hETzDRcqyS7DtrH3bnAb66WrQJ008tb+y4wkijJ0vLyQggETba8yB FaSxP9XTq4LGPPD2j3V0frDaYcNOObA1eV+RrtO30Zc0TCNWQbXAZu78A9C7IGMmxG8l 8RPBQaGXJHE2WNckTpKcQPCuUZ7xaGLs8C3DVT8D1yR1booygbxthQKkI5oFPexnrlRb aTcg== X-Gm-Message-State: AOAM533kZARa+1qGEKLe3GarcZNQ8Am3OIeYX+1gVuVmfGHiqmKYJuT4 6jkXFmwlirSc6u7Qf++3avk= X-Google-Smtp-Source: ABdhPJxxrg71NYqj9JmpDilG5LIKU03tj1xciLNOZ9+LS1mB6jPFAD7osNeYjCYZVDL3DR/ZuDJpeQ== X-Received: by 2002:a17:90b:212:: with SMTP id fy18mr28353175pjb.52.1628072576096; Wed, 04 Aug 2021 03:22:56 -0700 (PDT) Received: from localhost.localdomain (104.194.74.249.16clouds.com. [104.194.74.249]) by smtp.gmail.com with ESMTPSA id z14sm2291976pfr.121.2021.08.04.03.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 03:22:55 -0700 (PDT) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: narmstrong@baylibre.com Cc: u-boot@lists.denx.de, u-boot-amlogic@groups.io, xypron.glpk@gmx.de, agraf@csgraf.de, trini@konsulko.com, christianshewitt@gmail.com, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH 2/4] EFI: console: query_console_size: multiplex adaptation Date: Wed, 4 Aug 2021 18:22:15 +0800 Message-Id: <20210804102217.2419510-3-art@khadas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210804102217.2419510-1-art@khadas.com> References: <20210804102217.2419510-1-art@khadas.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Multiplexed adaptation of the query_console_size() function; automatically determine the minimal console area that will fit all outputs properly. Signed-off-by: Artem Lapkin --- lib/efi_loader/efi_console.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 3b012e1a66..ef5cf21bf7 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -340,14 +340,18 @@ static int __maybe_unused query_vidconsole(int *rows, int *cols) static void query_console_size(void) { int rows = 25, cols = 80; - int ret = -ENODEV; - if (IS_ENABLED(CONFIG_DM_VIDEO)) - ret = query_vidconsole(&rows, &cols); - if (ret) - ret = query_console_serial(&rows, &cols); - if (ret) + if (IS_ENABLED(CONFIG_DM_VIDEO) && + !query_vidconsole(&rows, &cols)) { + int rows_serial, cols_serial; + + if (!query_console_serial(&rows_serial, &cols_serial)) { + rows = min(rows, rows_serial); + cols = min(cols, cols_serial); + } + } else if (query_console_serial(&rows, &cols)) { return; + } /* Test if we can have Mode 1 */ if (cols >= 80 && rows >= 50) {