diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-12-06 12:56:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-05 13:43:32 +1000 |
| commit | d1fbd923da0f982f12b61a44e74c2e1f74c6ef56 (patch) | |
| tree | 00f63b4834e43db75044c51db366cb59076357b4 /drivers | |
| parent | 5ccb377feaaff3daa1e9a179534bbd7550d78af6 (diff) | |
| download | op-kernel-dev-d1fbd923da0f982f12b61a44e74c2e1f74c6ef56.zip op-kernel-dev-d1fbd923da0f982f12b61a44e74c2e1f74c6ef56.tar.gz | |
nouveau/acpi: improve detection of what is IGD and what is DIS.
This improves the IGD/DIS picking using firstly if Intel, then
if the bus is bus 0. There may be a correct way to do this, but
I've no idea what it is.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_acpi.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 1191526..a542380 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c @@ -130,10 +130,15 @@ static int nouveau_dsm_init(void) static int nouveau_dsm_get_client_id(struct pci_dev *pdev) { - if (nouveau_dsm_priv.dhandle == DEVICE_ACPI_HANDLE(&pdev->dev)) + /* easy option one - intel vendor ID means Integrated */ + if (pdev->vendor == PCI_VENDOR_ID_INTEL) return VGA_SWITCHEROO_IGD; - else - return VGA_SWITCHEROO_DIS; + + /* is this device on Bus 0? - this may need improving */ + if (pdev->bus->number == 0) + return VGA_SWITCHEROO_IGD; + + return VGA_SWITCHEROO_DIS; } static struct vga_switcheroo_handler nouveau_dsm_handler = { |
