4.14-stable patches

added patches:
	drm-amdgpu-fix-rlc-safe-mode-test-in-gfx_v9_0_enter_rlc_safe_mode.patch
	drm-i915-lpe-mark-lpe-audio-runtime-pm-as-no-callbacks.patch

diff --git a/queue-4.14/drm-amdgpu-fix-rlc-safe-mode-test-in-gfx_v9_0_enter_rlc_safe_mode.patch b/queue-4.14/drm-amdgpu-fix-rlc-safe-mode-test-in-gfx_v9_0_enter_rlc_safe_mode.patch
new file mode 100644 (file)
index 0000000..7cacec0
--- /dev/null
+++ b/queue-4.14/drm-amdgpu-fix-rlc-safe-mode-test-in-gfx_v9_0_enter_rlc_safe_mode.patch
@@ -0,0 +1,42 @@
+From 226127a67e31a9518d9516d3e4890759b379d874 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
+Date: Thu, 19 Jul 2018 18:33:39 +0200
+Subject: drm/amdgpu: Fix RLC safe mode test in gfx_v9_0_enter_rlc_safe_mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 226127a67e31a9518d9516d3e4890759b379d874 upstream.
+
+We were testing the register offset, instead of the value stored in the
+register, therefore always timing out the loop.
+
+This reduces suspend time of the system in the bug report below by ~600
+ms.
+
+Cc: stable@vger.kernel.org
+Bugzilla: https://bugs.freedesktop.org/107277
+Tested-by: Paul Menzel <pmenzel@molgen.mpg.de>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -3113,7 +3113,7 @@ static void gfx_v9_0_enter_rlc_safe_mode
+ 
+               /* wait for RLC_SAFE_MODE */
+               for (i = 0; i < adev->usec_timeout; i++) {
+-                      if (!REG_GET_FIELD(SOC15_REG_OFFSET(GC, 0, mmRLC_SAFE_MODE), RLC_SAFE_MODE, CMD))
++                      if (!REG_GET_FIELD(RREG32_SOC15(GC, 0, mmRLC_SAFE_MODE), RLC_SAFE_MODE, CMD))
+                               break;
+                       udelay(1);
+               }

diff --git a/queue-4.14/drm-i915-lpe-mark-lpe-audio-runtime-pm-as-no-callbacks.patch b/queue-4.14/drm-i915-lpe-mark-lpe-audio-runtime-pm-as-no-callbacks.patch
new file mode 100644 (file)
index 0000000..6f4f630
--- /dev/null
+++ b/queue-4.14/drm-i915-lpe-mark-lpe-audio-runtime-pm-as-no-callbacks.patch
@@ -0,0 +1,48 @@
+From 75eef0f1ed478284911b8723a5bdb659499a7aac Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 2 Aug 2018 15:04:16 +0100
+Subject: drm/i915/lpe: Mark LPE audio runtime pm as "no callbacks"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 75eef0f1ed478284911b8723a5bdb659499a7aac upstream.
+
+The LPE audio is a child device of i915, it is powered up and down
+alongside the igfx and presents no independent runtime interface. This
+aptly fulfils the description of a "No-Callback" Device, so mark it
+thus.
+
+Fixes: 183c00350ccd ("drm/i915: Fix runtime PM for LPE audio")
+Testcase: igt/pm_rpm/basic-pci-d3-state
+Testcase: igt/pm_rpm/basic-rte
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: stable@vger.kernel.org
+Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20180802140416.6062-1-chris@chris-wilson.co.uk
+(cherry picked from commit 46e831abe864a6b59fa3de253a681c0f2ee1bf2f)
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_lpe_audio.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_lpe_audio.c
++++ b/drivers/gpu/drm/i915/intel_lpe_audio.c
+@@ -128,9 +128,7 @@ lpe_audio_platdev_create(struct drm_i915
+ 
+       kfree(rsc);
+ 
+-      pm_runtime_forbid(&platdev->dev);
+-      pm_runtime_set_active(&platdev->dev);
+-      pm_runtime_enable(&platdev->dev);
++      pm_runtime_no_callbacks(&platdev->dev);
+ 
+       return platdev;
+ 

diff --git a/queue-4.14/series b/queue-4.14/series
index 3e5e649199a567d634548a0b1e188e5f0f5f5420..48f9ba8aa767bd5ce1d39281c178ef1810a36643 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -84,3 +84,5 @@ btrfs-relocation-only-remove-reloc-rb_trees-if-reloc-control-has-been-initialize
 btrfs-don-t-remove-block-group-that-still-has-pinned-down-bytes.patch
 arm64-rockchip-force-config_pm-on-rockchip-systems.patch
 arm-rockchip-force-config_pm-on-rockchip-systems.patch
+drm-i915-lpe-mark-lpe-audio-runtime-pm-as-no-callbacks.patch
+drm-amdgpu-fix-rlc-safe-mode-test-in-gfx_v9_0_enter_rlc_safe_mode.patch