Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-21 17:48:49 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-21 17:50:31 +0100
commitca68b03780fd48708e440269f871ce05e188d0f2 (patch)
tree0d1a95b05590ea1156347ae62842bd57dcdb4cc7
parentbbd5c28342a9827f7e6ab3cbc5746b3cf16392a5 (diff)
Delete patches.suse/drm-i915-CFL-NVMe-breakage-workaround.patch (bsc#1122554)SLE15
The PCI SSID matches with other machine(s?) on the market, and leads to the boot problem. Let's remove the hackish patch for now.
-rw-r--r--patches.suse/drm-i915-CFL-NVMe-breakage-workaround.patch37
-rw-r--r--series.conf2
2 files changed, 0 insertions, 39 deletions
diff --git a/patches.suse/drm-i915-CFL-NVMe-breakage-workaround.patch b/patches.suse/drm-i915-CFL-NVMe-breakage-workaround.patch
deleted file mode 100644
index fe5ac0cf40..0000000000
--- a/patches.suse/drm-i915-CFL-NVMe-breakage-workaround.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Subject: Workaround for mysterious NVMe breakage with i915 CFL
-Patch-mainline: Never, a temporary workaround
-References: bsc#1111040
-
-A temporary workaround for a new CFL that breaks NVMe by some reason
-at detecting the non-existing HDMI-3 port.
-
-This should be removed once when it gets fixed properly in the upstream
-code.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- drivers/gpu/drm/i915/intel_bios.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpu/drm/i915/intel_bios.c
-+++ b/drivers/gpu/drm/i915/intel_bios.c
-@@ -2031,11 +2031,17 @@ intel_bios_is_lspcon_present(struct drm_
- enum port port)
- {
- const struct child_device_config *child;
-+ struct pci_dev *pdev = dev_priv->drm.pdev;
- int i;
-
- if (!HAS_LSPCON(dev_priv))
- return false;
-
-+ // XXX: workaround for a buggy Intel board (bsc#1111040)
-+ if (pdev->subsystem_vendor == 0x8086 &&
-+ pdev->subsystem_device == 0x2212)
-+ return true;
-+
- for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
- child = dev_priv->vbt.child_dev + i;
-
diff --git a/series.conf b/series.conf
index 1d3b2a6d13..6c9a369289 100644
--- a/series.conf
+++ b/series.conf
@@ -20115,8 +20115,6 @@
patches.arch/drm-hibmc-Use-set_busid-function-from-drm-core.patch
patches.drm/drm-hibmc-initialize-the-hibmc_bo_driver_io_mem_pfn.patch
- patches.suse/drm-i915-CFL-NVMe-breakage-workaround.patch
-
########################################################
# Out-of-tree networking
########################################################