Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora

2 files changed, 3 insertions, 75 deletions

diff --git a/kernel.spec b/kernel.spec
index e71ddea13..49b7d4e1e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -608,7 +608,6 @@ Patch532: 0001-dma-direct-correct-the-physical-addr-in-dma_direct_s.patch
 
 # These should make stable soon
 Patch533: for-v5.2-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-Patch534: stable-v5.2-drm-i915-vbt-Fix-VBT-parsing-for-the-PSR-section.patch
 
 # rhbz 1737046 temporary revert until issue is fixed upstream
 Patch535: 0001-Revert-for-bz-1737046.patch
@@ -1860,6 +1859,9 @@ fi
 #
 #
 %changelog
+* Sat Aug 10 2019 Justin M. Forbes <jforbes@redhat.com> - 5.2.8-200
+- Linux v5.2.8
+
 * Thu Aug 08 2019 Justin M. Forbes <jforbes@redhat.com> - 5.2.7-200
 - Linux v5.2.7
 
diff --git a/stable-v5.2-drm-i915-vbt-Fix-VBT-parsing-for-the-PSR-section.patch b/stable-v5.2-drm-i915-vbt-Fix-VBT-parsing-for-the-PSR-section.patch
deleted file mode 100644
index b9e310ae3..000000000
--- a/stable-v5.2-drm-i915-vbt-Fix-VBT-parsing-for-the-PSR-section.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From patchwork Mon Jul 22 23:13:25 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [stable,v5.2] drm/i915/vbt: Fix VBT parsing for the PSR section
-From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-X-Patchwork-Id: 319173
-Message-Id: <20190722231325.16615-1-dhinakaran.pandiyan@intel.com>
-To: intel-gfx@lists.freedesktop.org
-Cc: sashal@kernel.org, stable@vger.kernel.org,
- Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Date: Mon, 22 Jul 2019 16:13:25 -0700
-
-A single 32-bit PSR2 training pattern field follows the sixteen element
-array of PSR table entries in the VBT spec. But, we incorrectly define
-this PSR2 field for each of the PSR table entries. As a result, the PSR1
-training pattern duration for any panel_type != 0 will be parsed
-incorrectly. Secondly, PSR2 training pattern durations for VBTs with bdb
-version >= 226 will also be wrong.
-
-Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Cc: José Roberto de Souza <jose.souza@intel.com>
-Cc: stable@vger.kernel.org
-Cc: stable@vger.kernel.org #v5.2
-Fixes: 88a0d9606aff ("drm/i915/vbt: Parse and use the new field with PSR2 TP2/3 wakeup time")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111088
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204183
-Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
-Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Tested-by: François Guerraz <kubrick@fgv6.net>
-Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20190717223451.2595-1-dhinakaran.pandiyan@intel.com
-(cherry picked from commit b5ea9c9337007d6e700280c8a60b4e10d070fb53)
----
- drivers/gpu/drm/i915/intel_bios.c     | 2 +-
- drivers/gpu/drm/i915/intel_vbt_defs.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
-index 1dc8d03ff127..ee6fa75d65a2 100644
---- a/drivers/gpu/drm/i915/intel_bios.c
-+++ b/drivers/gpu/drm/i915/intel_bios.c
-@@ -762,7 +762,7 @@ parse_psr(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
- 	}
- 
- 	if (bdb->version >= 226) {
--		u32 wakeup_time = psr_table->psr2_tp2_tp3_wakeup_time;
-+		u32 wakeup_time = psr->psr2_tp2_tp3_wakeup_time;
- 
- 		wakeup_time = (wakeup_time >> (2 * panel_type)) & 0x3;
- 		switch (wakeup_time) {
-diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
-index fdbbb9a53804..796c070bbe6f 100644
---- a/drivers/gpu/drm/i915/intel_vbt_defs.h
-+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
-@@ -772,13 +772,13 @@ struct psr_table {
- 	/* TP wake up time in multiple of 100 */
- 	u16 tp1_wakeup_time;
- 	u16 tp2_tp3_wakeup_time;
--
--	/* PSR2 TP2/TP3 wakeup time for 16 panels */
--	u32 psr2_tp2_tp3_wakeup_time;
- } __packed;
- 
- struct bdb_psr {
- 	struct psr_table psr_table[16];
-+
-+	/* PSR2 TP2/TP3 wakeup time for 16 panels */
-+	u32 psr2_tp2_tp3_wakeup_time;
- } __packed;
- 
- /*