diff options
| author |   Alex Deucher <alexdeucher@gmail.com> | 2014-04-15 12:44:34 -0400 |
|---|---|---|
| committer |   Christian König <christian.koenig@amd.com> | 2014-04-22 16:51:20 +0200 |
| commit | e9a4099a59cc598a44006059dd775c25e422b772 (patch) | |
| tree | ccdc81063ec6b480f444cdc3c4ecf780384dcf06 /drivers/gpu/drm/radeon/radeon_atpx_handler.c | |
| parent | drm/radeon/pm: don't walk the crtc list before it has been initialized (v2) (diff) | |
| download | linux-dev-e9a4099a59cc598a44006059dd775c25e422b772.tar.xz linux-dev-e9a4099a59cc598a44006059dd775c25e422b772.zip | |
drm/radeon: fix ATPX detection on non-VGA GPUs
Some newer PX laptops have the pci device class
set to DISPLAY_OTHER rather than DISPLAY_VGA. This
properly detects ATPX on those laptops.
Based on a patch from: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Cc: airlied@gmail.com
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atpx_handler.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atpx_handler.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index dedea72f48c4..a9fb0d016d38 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c @@ -528,6 +528,13 @@ static bool radeon_atpx_detect(void) has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true); } + /* some newer PX laptops mark the dGPU as a non-VGA display device */ + while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) { + vga_count++; + + has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true); + } + if (has_atpx && vga_count == 2) { acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); printk(KERN_INFO "VGA switcheroo: detected switching method %s handle\n", |