From a867f98202e4ba9d9ab478921c2466c590419d43 Mon Sep 17 00:00:00 2001
From: Tobias Schumacher <tobe.schumacher@gmail.com>
Date: Tue, 21 Feb 2017 01:11:47 +0100
Subject: [PATCH] Fix lock up when switching off discrete graphics card in Dell
 XPS 9560 https://bugzilla.kernel.org/show_bug.cgi?id=156341

Signed-off-by: Tobias Schumacher <tobe.schumacher@gmail.com>
---
 drivers/acpi/blacklist.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 4421f7c..7945f2f 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -188,6 +188,20 @@ static struct dmi_system_id acpi_rev_dmi_table[] __initdata = {
 		      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude 3350"),
 		},
 	},
+	/*
+	 * Resolves issues that cause the system to lock up
+	 * under certain conditions when the discrete graphics
+	 * card is turned off
+	 */
+	{
+	 .callback = dmi_enable_rev_override,
+	 .ident = "DELL XPS 15 (2017)",
+	 .matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "XPS 15 9560"),
+		},
+	},
+
 #endif
 	{}
 };
-- 
2.9.3