From 7bb6074287b644438b02ddd2424d30a4523952c5 Mon Sep 17 00:00:00 2001 From: Petr Tesarik Date: Jan 11 2019 16:47:23 +0000 Subject: Refresh patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch. --- diff --git a/patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch b/patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch index 340d14b..4daf225 100644 --- a/patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch +++ b/patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch @@ -27,8 +27,8 @@ Reviewed-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20180824230844.12428-1-dhinakaran.pandiyan@intel.com Acked-by: Thomas Zimmermann --- - drivers/gpu/drm/i915/intel_psr.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) + drivers/gpu/drm/i915/intel_psr.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -41,7 +41,7 @@ Acked-by: Thomas Zimmermann if (!new_crtc_state->has_psr) return 0; -@@ -737,21 +735,19 @@ int intel_psr_wait_for_idle(const struct +@@ -737,21 +735,20 @@ int intel_psr_wait_for_idle(const struct * not needed and will induce latencies in the atomic * update path. */ @@ -66,7 +66,8 @@ Acked-by: Thomas Zimmermann - EDP_PSR_STATUS_STATE_IDLE, 50); + return __intel_wait_for_register(dev_priv, EDP_PSR_STATUS, + EDP_PSR_STATUS_STATE_MASK, -+ EDP_PSR_STATUS_STATE_IDLE, 50); ++ EDP_PSR_STATUS_STATE_IDLE, 2, 50, ++ NULL); } static bool __psr_wait_for_idle_locked(struct drm_i915_private *dev_priv)