Skip to content

Commit ebca08f

Browse files
soyersoyerrafaeljw
authored andcommitted
ACPI: video: Handle fetching EDID as ACPI_TYPE_PACKAGE
The _DDC method should return a buffer, or an integer in case of an error. But some Lenovo laptops incorrectly return EDID as buffer in ACPI package. Calling _DDC generates this ACPI Warning: ACPI Warning: \_SB.PCI0.GP17.VGA.LCD._DDC: Return type mismatch - \ found Package, expected Integer/Buffer (20240827/nspredef-254) Use the first element of the package to get the EDID buffer. The DSDT: Name (AUOP, Package (0x01) { Buffer (0x80) { ... } }) ... Method (_DDC, 1, NotSerialized) // _DDC: Display Data Current { If ((PAID == AUID)) { Return (AUOP) /* \_SB_.PCI0.GP17.VGA_.LCD_.AUOP */ } ElseIf ((PAID == IVID)) { Return (IVOP) /* \_SB_.PCI0.GP17.VGA_.LCD_.IVOP */ } ElseIf ((PAID == BOID)) { Return (BOEP) /* \_SB_.PCI0.GP17.VGA_.LCD_.BOEP */ } ElseIf ((PAID == SAID)) { Return (SUNG) /* \_SB_.PCI0.GP17.VGA_.LCD_.SUNG */ } Return (Zero) } Link: https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/Apx_B_Video_Extensions/output-device-specific-methods.html#ddc-return-the-edid-for-this-device Cc: stable@vger.kernel.org Fixes: c6a8370 ("drm/amd/display: Fetch the EDID from _DDC if available for eDP") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4085 Signed-off-by: Gergo Koteles <soyer@irl.hu> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Link: https://patch.msgid.link/61c3df83ab73aba0bc7a941a443cd7faf4cf7fb0.1743195250.git.soyer@irl.hu Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 064009e commit ebca08f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/acpi/acpi_video.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,13 @@ acpi_video_device_EDID(struct acpi_video_device *device, void **edid, int length
649649

650650
obj = buffer.pointer;
651651

652+
/*
653+
* Some buggy implementations incorrectly return the EDID buffer in an ACPI package.
654+
* In this case, extract the buffer from the package.
655+
*/
656+
if (obj && obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 1)
657+
obj = &obj->package.elements[0];
658+
652659
if (obj && obj->type == ACPI_TYPE_BUFFER) {
653660
*edid = kmemdup(obj->buffer.pointer, obj->buffer.length, GFP_KERNEL);
654661
ret = *edid ? obj->buffer.length : -ENOMEM;
@@ -658,7 +665,7 @@ acpi_video_device_EDID(struct acpi_video_device *device, void **edid, int length
658665
ret = -EFAULT;
659666
}
660667

661-
kfree(obj);
668+
kfree(buffer.pointer);
662669
return ret;
663670
}
664671

0 commit comments

Comments
 (0)