Hi Sakari,
On Wed, Jun 12, 2024 at 2:07 PM Sakari Ailus sakari.ailus@linux.intel.com wrote:
Hi Hans,
Thanks for the set.
On Wed, Jun 12, 2024 at 12:42:20PM +0200, Hans de Goede wrote:
It seems that all Dell laptops with IPU6 camera or the Tiger Lake,
"Seems that"? I don't argue against though as I have little information on this, in fact only two systems.
Alder Lake and Raptor Lake generations have broken ACPI MIPI DISCO information.
Instead of adding a lot of DMI quirks for this, check for these CPU generations and disable ACPI MIPI DISCO support on all Dell laptops with these CPU generations.
Is there still a need to include linux/dmi.h?
Fixes: bd721b934323 ("ACPI: scan: Extract CSI-2 connection graph from _CRS") Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede hdegoede@redhat.com
drivers/acpi/internal.h | 4 ++++ drivers/acpi/mipi-disco-img.c | 28 +++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 2a0e9fc7b74c..601b670356e5 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -302,6 +302,10 @@ void acpi_mipi_check_crs_csi2(acpi_handle handle); void acpi_mipi_scan_crs_csi2(void); void acpi_mipi_init_crs_csi2_swnodes(void); void acpi_mipi_crs_csi2_cleanup(void); +#ifdef CONFIG_X86 bool acpi_graph_ignore_port(acpi_handle handle); +#else +static inline bool acpi_graph_ignore_port(acpi_handle handle) { return false; } +#endif
#endif /* _ACPI_INTERNAL_H_ */ diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c index d05413a0672a..0ab13751f0db 100644 --- a/drivers/acpi/mipi-disco-img.c +++ b/drivers/acpi/mipi-disco-img.c @@ -725,14 +725,20 @@ void acpi_mipi_crs_csi2_cleanup(void) acpi_mipi_del_crs_csi2(csi2); }
-static const struct dmi_system_id dmi_ignore_port_nodes[] = {
{.matches = {DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."),DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS 9315"),I believe the patch adding XPS 9320 has been merged so reverting that first might help backporting. Or maybe it's only in Rafael's testing/for-next branches and so can be dropped easily?
It was in a topic branch, so it could be dropped.