From 968799c19bbd34c0765bc2dfded7697c7c48a32f Mon Sep 17 00:00:00 2001
From: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Mon, 12 Feb 2018 14:54:31 +0300
Subject: [PATCH] Drop i915_hack_bug_97822.patch

Although the patch could be revisited to apply to the kernel 4.15, the
mentioned bug report states that switching to UEFI and disabling legacy
boot fixes the issue.

See https://bugs.freedesktop.org/show_bug.cgi?id=97822.

They also say that the issue is not in the driver but rather in BIOS
provided by HP and used in legacy boot.
---
 i915_hack_bug_97822.patch | 54 ---------------------------------------
 kernel.spec               |  4 ---
 2 files changed, 58 deletions(-)
 delete mode 100644 i915_hack_bug_97822.patch

diff --git a/i915_hack_bug_97822.patch b/i915_hack_bug_97822.patch
deleted file mode 100644
index ca32158..0000000
--- a/i915_hack_bug_97822.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-A hack used when investigating https://bugs.freedesktop.org/show_bug.cgi?id=97822.
-
-From 8f6bd6297a9c62f03aa3ff3855ff4a159fddd55a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-Date: Thu, 6 Oct 2016 18:30:38 +0300
-Subject: [PATCH] drm/i915/hack: Abuse i915.vbt_sdvo_panel_type also for
- LVDS/eDP/DSI
-
----
- drivers/gpu/drm/i915/intel_bios.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
-index 1f8af87..0404478 100644
---- a/drivers/gpu/drm/i915/intel_bios.c
-+++ b/drivers/gpu/drm/i915/intel_bios.c
-@@ -218,19 +218,25 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
- 
- 	dev_priv->vbt.lvds_dither = lvds_options->pixel_dither;
- 
--	ret = intel_opregion_get_panel_type(dev_priv);
--	if (ret >= 0) {
--		WARN_ON(ret > 0xf);
--		panel_type = ret;
--		DRM_DEBUG_KMS("Panel type: %d (OpRegion)\n", panel_type);
--	} else {
--		if (lvds_options->panel_type > 0xf) {
--			DRM_DEBUG_KMS("Invalid VBT panel type 0x%x\n",
--				      lvds_options->panel_type);
--			return;
-+	panel_type = i915.vbt_sdvo_panel_type;
-+	if (panel_type == -2)
-+		return;
-+
-+	if (panel_type < 0) {
-+		ret = intel_opregion_get_panel_type(dev_priv);
-+		if (ret >= 0) {
-+			WARN_ON(ret > 0xf);
-+			panel_type = ret;
-+			DRM_DEBUG_KMS("Panel type: %d (OpRegion)\n", panel_type);
-+		} else {
-+			if (lvds_options->panel_type > 0xf) {
-+				DRM_DEBUG_KMS("Invalid VBT panel type 0x%x\n",
-+					lvds_options->panel_type);
-+				return;
-+			}
-+			panel_type = lvds_options->panel_type;
-+			DRM_DEBUG_KMS("Panel type: %d (VBT)\n", panel_type);
- 		}
--		panel_type = lvds_options->panel_type;
--		DRM_DEBUG_KMS("Panel type: %d (VBT)\n", panel_type);
- 	}
- 
- 	dev_priv->vbt.panel_type = panel_type;
diff --git a/kernel.spec b/kernel.spec
index 2ce7cfa..db0fa46 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -203,10 +203,6 @@ Patch109:	fs-aufs4.patch
 # Fix building of perf on 32-bit systems
 Patch110:	perf-unwind-include-errno_h.patch
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=97822
-# http://bugs.rosalinux.ru/show_bug.cgi?id=7533
-Patch200:	i915_hack_bug_97822.patch
-
 # Sanitizing kernel memory
 # We do not use "Patch:" here because apply_patches would always apply it
 # then, it seems, even if we place "Patch: <..>" under a conditional.