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 411AA303DEB; Thu, 17 Jul 2025 17:38:42 +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=1752773923; cv=none; b=oFnKsVfWzna06ompsU4A2OVaogo65iYpAOa7XXjcnwh+EzT7JjBW3Y7wkLcIX0tz0XoVIbBFyKelBlAuhVbUsFI5xr+2o1eeDcavNnWTbmy2Sz7PdGUJOB4sv+LVfjhucKZ6j0mOO0Avdw51QEtEUuhQNTI3S5zl6J2gX3qvM+8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752773923; c=relaxed/simple; bh=qH+nP7l6aO/IuqqbAQWnlb+L+ux6ugVAwetscoen+88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hG9c7hyER3TCmOsFV9nC7G7155PjSMT7DF/QaKfJyG0vqOQz5cpe99NCgKTyTjng+wjF6c3D4zCvzMtD8zbzilbaGsgVQfNQcdF6Y8AZyIn+DKx5FbWfy2lPuQj2uaH/ZiOfgilDVN1b4mRmP+sUGd9UvDADCWujcB+6tK4pSek= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XsgStJ3B; 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="XsgStJ3B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8256EC4CEE3; Thu, 17 Jul 2025 17:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752773922; bh=qH+nP7l6aO/IuqqbAQWnlb+L+ux6ugVAwetscoen+88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XsgStJ3BmqyPAuD/rv2rntCq4SiGgBm1p/6mfU2mQ+BWeEB10J9WVmu4kTCjIlApH QQDG0j3ka9YQMsAKJR+Qntbvq8pT9CNWvZPl+XhCZMUFXuAVPLlQTMgHg+oN0mRjr4 +iyyPV2yJMyRWZSqiAmJWq4vNRrckgCTwkjdxnzOmR/OFW9yS7cKWJyNm6iO/iVc86 pYClw/RNLC7PgbgPPRRtrV3fBIOSPOn6GPG/mnccVmuzRQ1O+UHGlbB2WR+DOYt0vf 3uLm79nQBMNLkwwfRvJEFpAN297AogRv/pG2WKayEZvVi7G9+sqsZuYoEqHM6dtcC9 JEOaNat9ylM5w== From: Mario Limonciello To: David Airlie , Bjorn Helgaas Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , 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 v9 8/9] fbcon: Use screen info to find primary device Date: Thu, 17 Jul 2025 12:38:11 -0500 Message-ID: <20250717173812.3633478-9-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250717173812.3633478-1-superm1@kernel.org> References: <20250717173812.3633478-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mario Limonciello On systems with non VGA GPUs fbcon can't find the primary GPU because video_is_primary_device() only checks the VGA arbiter. Add a screen info check to video_is_primary_device() so that callers can get accurate data on such systems. Reviewed-by: Thomas Zimmermann Suggested-by: Thomas Zimmermann Signed-off-by: Mario Limonciello --- v8: * add guards for the non CONFIG_SCREEN_INFO case v5: * Only change video-common.c v4: * use helper --- arch/x86/video/video-common.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/x86/video/video-common.c b/arch/x86/video/video-common.c index 81fc97a2a837a..4bbfffec4b640 100644 --- a/arch/x86/video/video-common.c +++ b/arch/x86/video/video-common.c @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -27,6 +28,9 @@ EXPORT_SYMBOL(pgprot_framebuffer); bool video_is_primary_device(struct device *dev) { +#ifdef CONFIG_SCREEN_INFO + struct screen_info *si = &screen_info; +#endif struct pci_dev *pdev; if (!dev_is_pci(dev)) @@ -34,7 +38,18 @@ bool video_is_primary_device(struct device *dev) pdev = to_pci_dev(dev); - return (pdev == vga_default_device()); + if (!pci_is_display(pdev)) + return false; + + if (pdev == vga_default_device()) + return true; + +#ifdef CONFIG_SCREEN_INFO + if (pdev == screen_info_pci_dev(si)) + return true; +#endif + + return false; } EXPORT_SYMBOL(video_is_primary_device); -- 2.43.0