From 60d85e51e2eb23d2f25283b4aad16bf585b2ced6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Jun 2014 14:05:25 -0700 Subject: [PATCH] 3.4-stable patches added patches: drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch --- ...n-fix-atpx-detection-on-non-vga-gpus.patch | 42 +++++++++++++++++++ queue-3.4/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-3.4/drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch diff --git a/queue-3.4/drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch b/queue-3.4/drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch new file mode 100644 index 00000000000..7dccc488d0c --- /dev/null +++ b/queue-3.4/drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch @@ -0,0 +1,42 @@ +From e9a4099a59cc598a44006059dd775c25e422b772 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 15 Apr 2014 12:44:34 -0400 +Subject: drm/radeon: fix ATPX detection on non-VGA GPUs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alex Deucher + +commit e9a4099a59cc598a44006059dd775c25e422b772 upstream. + +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 + +Signed-off-by: Alex Deucher +Cc: airlied@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c ++++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c +@@ -202,6 +202,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", diff --git a/queue-3.4/series b/queue-3.4/series index 4994be8497d..59989d05f8a 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -48,3 +48,4 @@ hrtimer-prevent-all-reprogramming-if-hang-detected.patch hrtimer-prevent-remote-enqueue-of-leftmost-timers.patch hrtimer-set-expiry-time-before-switch_hrtimer_base.patch md-avoid-possible-spinning-md-thread-at-shutdown.patch +drm-radeon-fix-atpx-detection-on-non-vga-gpus.patch -- 2.47.3