Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j6ZI9-0004MU-Jg for mharc-grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55698) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6ZI7-0004FP-0T for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6ZI4-0006l8-T1 for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:22 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50887 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6ZI4-0006kr-Om for grub-devel@gnu.org; Tue, 25 Feb 2020 07:26:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582633580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/EwWmDSMB8Y9SWcTVzg1MFLlo7rYhXXeJTD5jVwoviY=; b=iA6cqFMzh0IGCsM6liUmMuJ0Nv5Qfwfa4BQiCOCAUZT7bPh3Aoe8pLMryQsC3taE8xtWiB UTGcF/c6cqDSSNBbprGLF2ptxjwdcSEf+aH5CLL8WW/cB0SRvOnagH8M/5mXyDszlgffCT 5AlBDZAqJqnHdnaLQVvc4PAqynmJV30= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-315-hSfQddwbMcGEM0dtnAA4aA-1; Tue, 25 Feb 2020 07:26:16 -0500 X-MC-Unique: hSfQddwbMcGEM0dtnAA4aA-1 Received: by mail-wr1-f69.google.com with SMTP id 90so7223355wrq.6 for ; Tue, 25 Feb 2020 04:26:16 -0800 (PST) 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=Lu07lN48pnTHjTftGitpUWL2cxqKXSmfTKFOd9nvbzQ=; b=XPsATdHpIxx3R6Hnd4j4FGWEu1bHeuLLyPM7yE8peOkosODRPo4uuCCk63o5oTeSO+ 5yFv3Jw6YREzbUZrH5fIm+ilrxhaClI2gHvrdimJEV0r9KHpSVCGbBQq9yXRbea5KpJq xh7m/X/84V8EMeD6uWKLYVp02doJDzyj/tcxs/GTUYVs14w9Z10uE8BVuScoOl9AxB9R aGlYQYoG/VGmHvgV3bTPy//1kY0rtq1rSbSP1SEGE2xe7WLCXmliyv9iEdJGpw1+Qutq Ij13FlOt2tnxEceAd6gwazY+fndjAYXTkyYsNouXmOXy8l7/BBpd8c1tTsDVB3k5/qys flqA== X-Gm-Message-State: APjAAAXnQ9YQ4bCUIDBQeKN1EaAvP3+Xa4ewVtbKZk1KaPXKtQNT8Y33 XqxhLBPa9uwzJnbeeDDCUOVDZu9gYDK77o075pQ032VKgLJ54gJCFvhI7oPWSoAVNItWAVQI5ft oLKgXE9VGZ3A= X-Received: by 2002:adf:f787:: with SMTP id q7mr72992314wrp.297.1582633574956; Tue, 25 Feb 2020 04:26:14 -0800 (PST) X-Google-Smtp-Source: APXvYqz5NY4foJr12UXPvEI345DzLhH5F2owVpEHwPpzYWZpo7yZ882BrKmREDZoDSbLhR0iRSd07w== X-Received: by 2002:adf:f787:: with SMTP id q7mr72992292wrp.297.1582633574739; Tue, 25 Feb 2020 04:26:14 -0800 (PST) Received: from minerva.redhat.com ([2a01:c50f:ab80:6700:527f:85b3:5615:ff0b]) by smtp.gmail.com with ESMTPSA id q6sm17251653wrf.67.2020.02.25.04.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 04:26:14 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Daniel Kiper , Peter Jones , Javier Martinez Canillas Subject: [PATCH 09/10] video: Add more debug output on GOP and UGA probing Date: Tue, 25 Feb 2020 13:25:52 +0100 Message-Id: <20200225122553.1120216-10-javierm@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200225122553.1120216-1-javierm@redhat.com> References: <20200225122553.1120216-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2020 12:26:24 -0000 From: Peter Jones Add debug information to EFI GOP and UGA video drivers probing function. Signed-off-by: Peter Jones Signed-off-by: Javier Martinez Canillas --- grub-core/video/efi_gop.c | 8 +++++++- grub-core/video/efi_uga.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c index c9e40e8d4e9..be446f8d291 100644 --- a/grub-core/video/efi_gop.c +++ b/grub-core/video/efi_gop.c @@ -71,7 +71,10 @@ check_protocol (void) handles =3D grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, =09=09=09=09 &graphics_output_guid, NULL, &num_handles); if (!handles || num_handles =3D=3D 0) - return 0; + { + grub_dprintf ("video", "GOP: no handles\n"); + return 0; + } =20 for (i =3D 0; i < num_handles; i++) { @@ -81,6 +84,7 @@ check_protocol (void) grub_video_gop_iterate (check_protocol_hook, &have_usable_mode); if (have_usable_mode) =09{ +=09 grub_dprintf ("video", "GOP: found usable mode\n"); =09 grub_free (handles); =09 return 1; =09} @@ -89,6 +93,8 @@ check_protocol (void) gop =3D 0; gop_handle =3D 0; =20 + grub_dprintf ("video", "GOP: no usable mode\n"); + return 0; } =20 diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c index 97a607c01a5..e74d6c23500 100644 --- a/grub-core/video/efi_uga.c +++ b/grub-core/video/efi_uga.c @@ -110,7 +110,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, = void *data) { int i; =20 - grub_dprintf ("fb", "Display controller: %d:%d.%d\nDevice id: %x\n", + grub_dprintf ("video", "Display controller: %d:%d.%d\nDevice id: %x\= n", =09=09 grub_pci_get_bus (dev), grub_pci_get_device (dev), =09=09 grub_pci_get_function (dev), pciid); addr +=3D 8; @@ -140,7 +140,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, = void *data) =09 base64 <<=3D 32; =09 base64 |=3D (old_bar1 & GRUB_PCI_ADDR_MEM_MASK); =20 -=09 grub_dprintf ("fb", "%s(%d): 0x%" PRIxGRUB_UINT64_T "\n", +=09 grub_dprintf ("video", "%s(%d): 0x%" PRIxGRUB_UINT64_T "\n", =09=09=09((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ? =09=09=09"VMEM" : "MMIO"), type =3D=3D GRUB_PCI_ADDR_MEM_TYPE_64 ? i - 1 := i, =09=09=09base64); --=20 2.24.1