From patchwork Tue Jul 16 13:37:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132777 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="F6V8u2I1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1p24yjzz9sNj for ; Tue, 16 Jul 2019 23:43:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0CA18C21E47; Tue, 16 Jul 2019 13:41:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 291A7C21F48; Tue, 16 Jul 2019 13:39:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E5BBC21E60; Tue, 16 Jul 2019 13:38:18 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by lists.denx.de (Postfix) with ESMTPS id BA3EBC21E60 for ; Tue, 16 Jul 2019 13:38:17 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id v15so18726601wml.0 for ; Tue, 16 Jul 2019 06:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ddIyo50BU2nRnwKV21dLmjFaL1iHGfGisam8zudNZHo=; b=F6V8u2I1PEhC8jagQDoVhwG0QGStnDJdPglHMbxdVc+eIMILA9kru1pMAcpd4ERc7p gukUJI0tl5CkAd1hATYoBKF/7NoB2E1uCqsMO+wPviwnFjV/8wSLzcqWdmzYmf5olqkE 4zaqxV2EhQLC4QW2BdqDtO5kbfAaEWDrz29xvHNMSOOd6CkMYIIuhr9ufj5v0CF1mSGF X0j6t9dlQH9sLgqUhmUBIOendfziMila2UWm0044SCHbY5xOyxgN+qlKc0U52h8tsri3 9MphNOJ8SR4c6jVWwn9G0ZzMXmVYvHjki3fZtkheujoE4PaKZ+bQsaOuP6bfctGPcsIb 1gAA== 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=ddIyo50BU2nRnwKV21dLmjFaL1iHGfGisam8zudNZHo=; b=lU2Oy0asaKQldcgbW/hqb1fzGHreqJRfWo99PIh9hGFmfKzvjtOH1rcUkXISoOhT8j kCT6/95JC/0nAQ4gtElceKf3iu0gDH8sU62LjHpSFUUdqOGUZUwYPGqjwEAEQc4sgswM Ls2saOFE1dgNAcM+EC/0jaUydXKsiFFgupxpTnXNb8rjvYo7HbvU44tghnKSCwknwkf7 MAfgRWEEihmuJ8SKdyeNwg5kUY55fxkTp19KgGdOrRzh/eMqrUor4Q3ywsHwYMuKsBnT iWJ+jkBRRRQFUx3CyYmF5L00XezZKJ1V9SmTa25XQciAqf0y/W7kvpGTXq5JDJUF8lZK JTyQ== X-Gm-Message-State: APjAAAXTDgHIZme4t5ZGh3tnzXBHvRChwdaBpv8pKZzI6dW/gxV5Yo9W wfjgMyJK06kYA/UAkxwzpcJm3GlV X-Google-Smtp-Source: APXvYqxTZ8ivgaUc5pFHtuJejsHgT/1w00kE4KMtNMGvuLfRFWaFc6D/OAYbpLlZ8M2Z5BjPtqrwKQ== X-Received: by 2002:a1c:f418:: with SMTP id z24mr30553522wma.80.1563284296995; Tue, 16 Jul 2019 06:38:16 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:16 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:57 +0100 Message-Id: <20190716133803.1174-11-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Fabian Vogt Subject: [U-Boot] [PATCH 10/16] bcm2835 video: Bail out early if querying video information fails X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Fabian Vogt Otherwise there is a crash with newer RPi firmware, see https://github.com/raspberrypi/firmware/issues/1157 --- drivers/video/bcm2835.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index bc41090aed..4c7962cad8 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -19,13 +19,15 @@ static int bcm2835_video_probe(struct udevice *dev) debug("bcm2835: Query resolution...\n"); ret = bcm2835_get_video_size(&w, &h); - if (ret) + if (ret || w == 0 || h == 0) return -EIO; debug("bcm2835: Setting up display for %d x %d\n", w, h); ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB, BCM2835_MBOX_ALPHA_MODE_IGNORED, &fb_base, &fb_size, &pitch); + if(ret) + return -EIO; debug("bcm2835: Final resolution is %d x %d\n", w, h);