From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2BACC71157 for ; Tue, 17 Jun 2025 19:22:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EBC710E119; Tue, 17 Jun 2025 19:22:36 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="VuVZEPWy"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89F6B10E119 for ; Tue, 17 Jun 2025 19:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750188154; 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=BSn7XHZFzYmsxbIxESph49ANKqfYGKBPdtCCcSk0qA0=; b=VuVZEPWyEXTPiozupCu4VoBF8aDhRbpMfKP8pihLcFsQnZYV2CWe6/pbduQIQbXgqx8WDO rQSh4nLp1jK6NAVHoHdXCK0b3Wuh6hbn8ww8Y6HWn0CArEJPagW8O98Jl+6+hwv5CH8PvG 5Jy+9LIHe3upVrhfJcnZB0UU0+PE21M= Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-39-xGTJB6zpNfi70u2rDmnuDA-1; Tue, 17 Jun 2025 15:22:33 -0400 X-MC-Unique: xGTJB6zpNfi70u2rDmnuDA-1 X-Mimecast-MFC-AGG-ID: xGTJB6zpNfi70u2rDmnuDA_1750188153 Received: by mail-io1-f69.google.com with SMTP id ca18e2360f4ac-8726bf54568so69309839f.3 for ; Tue, 17 Jun 2025 12:22:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750188153; x=1750792953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BSn7XHZFzYmsxbIxESph49ANKqfYGKBPdtCCcSk0qA0=; b=pU/ZcNcAcN6PSeVPNTF5mONayU2WnnpmgSUSo7tFk2aoMAKYYzIz8fAUOwlXF1BIvo UeS4u5QQ88MjevmJaBrgwKSBaVAdSftNqqq8tqTnOGmVRUS2JTqDf1sOWzA12dFVVTXo rAeEVlAiuQwb4MVMfxRT21wwVtTkFkkry+5Qo4cGtmOdY6jidJ6XAG6qkudz1ZlPreXH 07bCuPaPMJmm7B5IpH88yTCwMGB4X1RqtFmMx7HewzClxwYi8Cbc1t/MYXS/ntaKdaCo 5xf3KRHODLV6ox53mu1Bk9FPXg01+61p7u7VBS9O7a0B9DEMUmjGZXVyYxrtPzCyrrwl cYRg== X-Forwarded-Encrypted: i=1; AJvYcCWYy08AGeFRbw89+wLIiQNQmI5XehDSbrADtIhEOKu1XLUUpZky2bCgOxmeFoWVaiLWHu5+Gr5UvmE=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzD2FQ+00w5Bpdt/q+q/TAD2wNle5slI8K5PKuPdxZObyEDO86V e5JkH0E7mmoGDm/lPr/hcOrdIRxwyp+XI3TuNp0q3Fk1h7Xp/GPulY9P+8Kb41DC+Xpnnr9NYH3 yE3Nv25qEKDIBZXHFdgIr+egGiYpy2FtEdUTnf+dx6BmUKRnLIfXenvmvovP3G+s8nNvVdA== X-Gm-Gg: ASbGncvsu/uczNXYDMGOD5DauvtnCtexpJ8yPMTxcrVNXwJOsol+Qz+pLm9NBuFc9oH YNJ3qNDLhE63hEdaIz9qyWdVJI6a2sDuDmWmIc2diD7bCzPgRV3Y/P8SlIliBPBE+6dIxBld/Hl z/2qjxrpU2xw7rksYG8z3k2tHgSt5XCBzo7xbe3HeRPakFig7UMdYaj3awkK5e9n89ZclbhiK1X vxX2pXjIUNh7JsigzGc6xXdpQZ1SxXPaTwK7ISta6vn3EJq2AWbG2v+ok8vJbSCVDIzFhPU+L61 MtbfSknqkV/B6ABf3FFpuMZrKA== X-Received: by 2002:a05:6602:6d01:b0:85b:544c:ba6c with SMTP id ca18e2360f4ac-875ded03081mr426800539f.1.1750188152644; Tue, 17 Jun 2025 12:22:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvT+wWOgl7pfKZbTZ4DvfyUSmBDBBx9AlWceV4usmHGm1/hFR2YB75bZK6jJl5rI9kUZOEVg== X-Received: by 2002:a05:6602:6d01:b0:85b:544c:ba6c with SMTP id ca18e2360f4ac-875ded03081mr426799139f.1.1750188152172; Tue, 17 Jun 2025 12:22:32 -0700 (PDT) Received: from redhat.com ([38.15.36.11]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-50149b9e03fsm2396367173.52.2025.06.17.12.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 12:22:30 -0700 (PDT) Date: Tue, 17 Jun 2025 13:22:28 -0600 From: Alex Williamson To: Mario Limonciello Cc: Bjorn Helgaas , Alex Deucher , Christian =?UTF-8?B?S8O2bmln?= , David Airlie , Simona Vetter , Lukas Wunner , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Woodhouse , Lu Baolu , Joerg Roedel , Will Deacon , Robin Murphy , 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: Re: [PATCH v2 6/6] vgaarb: Look at all PCI display devices in VGA arbiter Message-ID: <20250617132228.434adebf.alex.williamson@redhat.com> In-Reply-To: <20250617175910.1640546-7-superm1@kernel.org> References: <20250617175910.1640546-1-superm1@kernel.org> <20250617175910.1640546-7-superm1@kernel.org> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.43; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: c_gRBBH8LR3VwcpCf7V8p8A_J7c9I426sp8QSTxAs0s_1750188153 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, 17 Jun 2025 12:59:10 -0500 Mario Limonciello wrote: > From: Mario Limonciello > > On a mobile system with an AMD integrated GPU + NVIDIA discrete GPU the > AMD GPU is not being selected by some desktop environments for any > rendering tasks. This is because neither GPU is being treated as > "boot_vga" but that is what some environments use to select a GPU [1]. > > The VGA arbiter driver only looks at devices that report as PCI display > VGA class devices. Neither GPU on the system is a PCI display VGA class > device: > > c5:00.0 3D controller: NVIDIA Corporation Device 2db9 (rev a1) > c6:00.0 Display controller: Advanced Micro Devices, Inc. [AMD/ATI] Device 150e (rev d1) > > If the GPUs were looked at the vga_is_firmware_default() function actually > does do a good job at recognizing the case from the device used for the > firmware framebuffer. > > Modify the VGA arbiter code and matching sysfs file entries to examine all > PCI display class devices. The existing logic stays the same. > > This will cause all GPUs to gain a `boot_vga` file, but the correct device > (AMD GPU in this case) will now show `1` and the incorrect device shows `0`. > Userspace then picks the right device as well. > > Link: https://github.com/robherring/libpciaccess/commit/b2838fb61c3542f107014b285cbda097acae1e12 [1] > Suggested-by: Daniel Dadap > Acked-by: Thomas Zimmermann > Signed-off-by: Mario Limonciello > --- > drivers/pci/pci-sysfs.c | 2 +- > drivers/pci/vgaarb.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index 268c69daa4d57..c314ee1b3f9ac 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -1707,7 +1707,7 @@ static umode_t pci_dev_attrs_are_visible(struct kobject *kobj, > struct device *dev = kobj_to_dev(kobj); > struct pci_dev *pdev = to_pci_dev(dev); > > - if (a == &dev_attr_boot_vga.attr && pci_is_vga(pdev)) > + if (a == &dev_attr_boot_vga.attr && pci_is_display(pdev)) > return a->mode; > > return 0; > diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c > index 78748e8d2dbae..63216e5787d73 100644 > --- a/drivers/pci/vgaarb.c > +++ b/drivers/pci/vgaarb.c > @@ -1499,8 +1499,8 @@ static int pci_notify(struct notifier_block *nb, unsigned long action, > > vgaarb_dbg(dev, "%s\n", __func__); > > - /* Only deal with VGA class devices */ > - if (!pci_is_vga(pdev)) > + /* Only deal with PCI display class devices */ > + if (!pci_is_display(pdev)) > return 0; > > /* > @@ -1546,12 +1546,12 @@ static int __init vga_arb_device_init(void) > > bus_register_notifier(&pci_bus_type, &pci_notifier); > > - /* Add all VGA class PCI devices by default */ > + /* Add all PCI display class devices by default */ > pdev = NULL; > while ((pdev = > pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, > PCI_ANY_ID, pdev)) != NULL) { > - if (pci_is_vga(pdev)) > + if (pci_is_display(pdev)) > vga_arbiter_add_pci_device(pdev); > } > At the very least a non-VGA device should not mark that it decodes legacy resources, marking the boot VGA device is only a part of what the VGA arbiter does. It seems none of the actual VGA arbitration interfaces have been considered here though. I still think this is a bad idea and I'm not sure Thomas didn't withdraw his ack in the previous round[1]. Thanks, Alex [1]https://lore.kernel.org/all/bc0a3ac2-c86c-43b8-b83f-edfdfa5ee184@suse.de/