From patchwork Mon Mar 15 05:00:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1452976 X-Patchwork-Delegate: sjg@chromium.org 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 (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=TYv0qLoX; 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 4DzPXT6CFVz9sR4 for ; Mon, 15 Mar 2021 16:06:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5F1D82A65; Mon, 15 Mar 2021 06:02:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="TYv0qLoX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E584882A68; Mon, 15 Mar 2021 06:02:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) (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 456B082965 for ; Mon, 15 Mar 2021 06:02:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-pg1-x533.google.com with SMTP id t37so8955130pga.11 for ; Sun, 14 Mar 2021 22:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UJgN5iINtpe6TRLm4BWK00r4Rqu/pWvQDxXNg1oDixE=; b=TYv0qLoXjC8j4quH38DgG56w/+tlchVdF3aq1lVPvlpHvD5j6Rhn68JvwSY4mXuy4k pyQF68puoSPgAxgTJ0ZKc+ysyR8LqLnuRX0yilIdp+cepfroxi1xo9Rmt/qPO4vY0QVf Sy06+qV6KZK/GuKpwAkgbVfWzK5lrMWW9pAbs= 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=UJgN5iINtpe6TRLm4BWK00r4Rqu/pWvQDxXNg1oDixE=; b=mRX2PNFSCQrr/w+JHfDUZJ4vdO1SghtpuDzexpcO9AEomjQfHXugei1Z/2O23f24nO As2Csq2SJqtx38b1T+/GJAkHmGQc4J3GU8Yr6ff3dFD0uV7lD3XNujPwUpJTSObtYVSe DkIL6yzstUr4kYoYcj9+DW1BSbDtSRF/qgKtd5dININO9gPXnwyUmjBLl0wHrL8mprqk cHO6hA+905o7MrnmbBVPqBguoFL3EarDYzNJUyMUrLQm0cdSu3WZgO8pQrRBuo1jzFqm wbCQtW1F76xTCFutBtMX3nyXTV7b8YuxdSCtgVgbb33maAgbEWZJ0KsLs5xtYV+eNKE2 8tug== X-Gm-Message-State: AOAM533yiu+Vk4QXP1Cpd+dm70FQbc/TYraLW0JWbpasVBlN/KIrNSG3 XeR/qvVedy/TbHO+c+oPhR+vcwfNItVlJSKC X-Google-Smtp-Source: ABdhPJxUPc0X1/fg8WsbDVTwBTp7o/M8APmMvGTo4Y7XCmkOWlW/hcZTF5z4n9w7bP3XLljZUgnf7g== X-Received: by 2002:a63:f921:: with SMTP id h33mr21293965pgi.419.1615784541605; Sun, 14 Mar 2021 22:02:21 -0700 (PDT) Received: from sjg1.roam.corp.google.com (85.72.69.111.dynamic.snap.net.nz. [111.69.72.85]) by smtp.gmail.com with ESMTPSA id n10sm1921467pjo.15.2021.03.14.22.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 22:02:20 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass , Anatolij Gustschin , Andy Shevchenko , Wolfgang Wallner Subject: [PATCH 26/34] video: Fix video on coreboot with the copy buffer Date: Mon, 15 Mar 2021 18:00:26 +1300 Message-Id: <20210315173656.26.I5dcb2aca2ec5e0fb7626e3b2431d9bd40c46aeeb@changeid> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210315050034.1934660-1-sjg@chromium.org> References: <20210315050034.1934660-1-sjg@chromium.org> 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.102.4 at phobos.denx.de X-Virus-Status: Clean The copy buffer, if enabled, prevents booting from coreboot correctly, since no memory is allocated for it. Allow it to fall back to disabled in this situation. This ensures that a console is displayed, even if it is slow. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- drivers/pci/pci_rom.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index a14a4db3c2f..7bad4c82c0c 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -349,13 +349,10 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa, } /* Use double buffering if enabled */ - if (IS_ENABLED(CONFIG_VIDEO_COPY)) { - if (!plat->base) - return log_msg_ret("copy", -ENFILE); + if (IS_ENABLED(CONFIG_VIDEO_COPY) && plat->base) plat->copy_base = vesa->phys_base_ptr; - } else { + else plat->base = vesa->phys_base_ptr; - } log_debug("base = %lx, copy_base = %lx\n", plat->base, plat->copy_base); plat->size = vesa->bytes_per_scanline * vesa->y_resolution;