Hi
Am 27.06.25 um 06:31 schrieb Mario Limonciello:
> From: Mario Limonciello <mario.limonciello@amd.com>
>
> 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.
>
> Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Thanks for sticking with it. This patch is also useful without the sysfs
interface.
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Best regards
Thomas
> ---
> v5:
> * Only change video-common.c
> v4:
> * use helper
> ---
> arch/x86/video/video-common.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/video/video-common.c b/arch/x86/video/video-common.c
> index 81fc97a2a837a..917568e4d7fb1 100644
> --- a/arch/x86/video/video-common.c
> +++ b/arch/x86/video/video-common.c
> @@ -9,6 +9,7 @@
>
> #include <linux/module.h>
> #include <linux/pci.h>
> +#include <linux/screen_info.h>
> #include <linux/vgaarb.h>
>
> #include <asm/video.h>
> @@ -27,6 +28,7 @@ EXPORT_SYMBOL(pgprot_framebuffer);
>
> bool video_is_primary_device(struct device *dev)
> {
> + struct screen_info *si = &screen_info;
> struct pci_dev *pdev;
>
> if (!dev_is_pci(dev))
> @@ -34,7 +36,16 @@ 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;
> +
> + if (pdev == screen_info_pci_dev(si))
> + return true;
> +
> + return false;
> }
> EXPORT_SYMBOL(video_is_primary_device);
>
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)