From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB25C20E315; Fri, 27 Jun 2025 04:31:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750998693; cv=none; b=QIM6fE5ioIOUIngup4AVoZ86Vuo2OL6NG+an+fo4eCIwmbMtdziAHictPBS1Q+B0ArfuEIgIUKAXagTZWhFLd2A97a+HplotDilPS3SE7+sybX+SbonPwqZToZvqoj6O2A5SWfjAMcHLkb0Muk5cJ1iK8pnXFBhUKKAZLA4mq4g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750998693; c=relaxed/simple; bh=hely8rCeQBZS770H5X6E0gNUH0kghs8qNa/SePVXMhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aNtTZ/IJ47Kplhj8o8/RK+9JJBz1nUWNwIELZLrkDO1rawfMPoNWb4nK3XuhuIWHF7HOJVGGn7K+ukizJqvsdQpAfFJWvZ09IYRMZaTz7rlRyp7e4vkrjuaWc9hiORcHXJKOMZaaqaTjPvlg61l55h6GwJFtcnoA9pL5rNU15g8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BxbK4y2b; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BxbK4y2b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24874C4CEF0; Fri, 27 Jun 2025 04:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750998693; bh=hely8rCeQBZS770H5X6E0gNUH0kghs8qNa/SePVXMhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BxbK4y2bmsy2YViXCUY6o2vDGuBYCU2r0quU8NQl7pOc6/QE9G0rbOBBxPwkPQ3Y6 hSnESV7GxY9Nw1Q6yxevuFLHaJXtUKB4YZsOU/CSokNBq5RPdtEF5Lt6BqJHmrAmJx kV4wkeM/L3oxu9UlVoHD/LqDDlyz4ZR+JWbRucZx6xiWSt+OQVxGtZkvGNzXyL92b1 yemjBB/3PBz3vkukdfprjKe3BY2p5CaTjqcRcH4F/dSRbp2wg1IKPSZcr+NZEs2ufa bU5KZOajkpScJhalRLeI2iURnzEO7bHXp5QPDzGTXrEFG62glkh+VJahspl0b4VFtU 0b4Ca9M0ZhCjg== From: Mario Limonciello To: Bjorn Helgaas Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Lukas Wunner , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , Alex Williamson , Jaroslav Kysela , Takashi Iwai , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list), iommu@lists.linux.dev (open list:INTEL IOMMU (VT-d)), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), kvm@vger.kernel.org (open list:VFIO DRIVER), linux-sound@vger.kernel.org (open list:SOUND), Daniel Dadap , Mario Limonciello Subject: [PATCH v6 7/9] PCI/VGA: Replace vga_is_firmware_default() with a screen info check Date: Thu, 26 Jun 2025 23:31:06 -0500 Message-ID: <20250627043108.3141206-8-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250627043108.3141206-1-superm1@kernel.org> References: <20250627043108.3141206-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mario Limonciello vga_is_firmware_default() checks firmware resources to find the owner framebuffer resources to find the firmware PCI device. This is an open coded implementation of screen_info_pci_dev(). Switch to using screen_info_pci_dev() instead. Acked-by: Bjorn Helgaas Suggested-by: Thomas Zimmermann Signed-off-by: Mario Limonciello --- v6: * fix lkp robot error v5: * split from next patch --- drivers/pci/vgaarb.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c index 78748e8d2dbae..b58f94ee48916 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -556,34 +556,13 @@ EXPORT_SYMBOL(vga_put); static bool vga_is_firmware_default(struct pci_dev *pdev) { -#if defined(CONFIG_X86) - u64 base = screen_info.lfb_base; - u64 size = screen_info.lfb_size; - struct resource *r; - u64 limit; +#ifdef CONFIG_SCREEN_INFO + struct screen_info *si = &screen_info; - /* Select the device owning the boot framebuffer if there is one */ - - if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE) - base |= (u64)screen_info.ext_lfb_base << 32; - - limit = base + size; - - /* Does firmware framebuffer belong to us? */ - pci_dev_for_each_resource(pdev, r) { - if (resource_type(r) != IORESOURCE_MEM) - continue; - - if (!r->start || !r->end) - continue; - - if (base < r->start || limit >= r->end) - continue; - - return true; - } -#endif + return pdev == screen_info_pci_dev(si); +#else return false; +#endif } static bool vga_arb_integrated_gpu(struct device *dev) -- 2.43.0