2009-03-04 05:57:20

by Dave Airlie

Subject: [PATCH] pci: expose boot VGA device via sysfs.

X really would like to know which VGA device was considered the boot
device by the system. The x86 PCI fixups have support for discovering this
but we provide no way to expose it to userspace.

This adds a sysfs file per VGA class device which has the value 0 for
non the boot device or unknown, and 1 if the VGA device is the boot device.

Signed-off-by: Dave Airlie <[email protected]>
---
drivers/pci/pci-sysfs.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index dfc4e0d..52afb3a 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -241,6 +241,17 @@ struct device_attribute pci_dev_attrs[] = {
};

static ssize_t
+boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct pci_dev *pdev = to_pci_dev(dev);
+
+ return sprintf(buf, "%u\n",
+ !!(pdev->resource[PCI_ROM_RESOURCE].flags &
+ IORESOURCE_ROM_SHADOW));
+}
+struct device_attribute vga_attr = __ATTR_RO(boot_vga);
+
+static ssize_t
pci_read_config(struct kobject *kobj, struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
@@ -884,18 +895,27 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
pdev->rom_attr = attr;
}

+ if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) {
+ retval = device_create_file(&pdev->dev, &vga_attr);
+ if (retval)
+ goto err_rom_file;
+ }
+
/* add platform-specific attributes */
retval = pcibios_add_platform_entries(pdev);
if (retval)
- goto err_rom_file;
+ goto err_vga_file;

/* add sysfs entries for various capabilities */
retval = pci_create_capabilities_sysfs(pdev);
if (retval)
- goto err_rom_file;
+ goto err_vga_file;

return 0;

+err_vga_file:
+ if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
+ device_remove_file(&pdev->dev, &vga_attr);
err_rom_file:
if (rom_size) {
sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
--
1.6.0.3

2009-03-06 17:58:58

by Greg KH

Subject: Re: [PATCH] pci: expose boot VGA device via sysfs.

On Wed, Mar 04, 2009 at 05:57:05AM +0000, Dave Airlie wrote:
>
> X really would like to know which VGA device was considered the boot
> device by the system. The x86 PCI fixups have support for discovering this
> but we provide no way to expose it to userspace.
>
> This adds a sysfs file per VGA class device which has the value 0 for
> non the boot device or unknown, and 1 if the VGA device is the boot device.
>
> Signed-off-by: Dave Airlie <[email protected]>

Looks good to me:
Acked-by: Greg Kroah-Hartman <[email protected]>

thanks,

greg k-h

2009-03-20 02:12:29

by Jesse Barnes

Subject: Re: [PATCH] pci: expose boot VGA device via sysfs.

On Wed, 4 Mar 2009 05:57:05 +0000 (GMT)
Dave Airlie <[email protected]> wrote:

>
> X really would like to know which VGA device was considered the boot
> device by the system. The x86 PCI fixups have support for discovering
> this but we provide no way to expose it to userspace.
>
> This adds a sysfs file per VGA class device which has the value 0 for
> non the boot device or unknown, and 1 if the VGA device is the boot
> device.
>
> Signed-off-by: Dave Airlie <[email protected]>

Applied to my linux-next branch, thanks.

--
Jesse Barnes, Intel Open Source Technology Center