tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'launchpad-333386' into release

Len Brown 4697fd6f fee807e8

+7 -2
unified split
+6 -1
drivers/acpi/video.c
··· 1109 */ 1110 1111 /* Does this device support video switching? */ 1112 - if (video->cap._DOS) { 1113 video->flags.multihead = 1; 1114 status = 0; 1115 }
··· 1109 */ 1110 1111 /* Does this device support video switching? */ 1112 + if (video->cap._DOS || video->cap._DOD) { 1113 + if (!video->cap._DOS) { 1114 + printk(KERN_WARNING FW_BUG 1115 + "ACPI(%s) defines _DOD but not _DOS\n", 1116 + acpi_device_bid(video->device)); 1117 + } 1118 video->flags.multihead = 1; 1119 status = 0; 1120 }
+1 -1
drivers/acpi/video_detect.c
··· 84 return 0; 85 86 /* Does this device able to support video switching ? */ 87 - if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) && 88 ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy))) 89 video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING; 90
··· 84 return 0; 85 86 /* Does this device able to support video switching ? */ 87 + if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) || 88 ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy))) 89 video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING; 90