Home| summaryrefslogtreecommitdiff |
diff options
| author | Petr Tesarik <ptesarik@suse.cz> | 2019-01-11 17:47:23 +0100 |
|---|---|---|
| committer | Petr Tesarik <ptesarik@suse.cz> | 2019-01-11 17:47:23 +0100 |
| commit | 7bb6074287b644438b02ddd2424d30a4523952c5 (patch) | |
| tree | d24474bc9a09967ca89860148439d5604689ee2e | |
| parent | 097dbea51c1e2cd7a1130a8cef279085b6a16eab (diff) | |
Refreshrpm-4.12.14-28
patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch.
| -rw-r--r-- | patches.drm/0038-drm-i915-psr-Remove-wait_for_idle-for-PSR2.patch | 9 |
1 files changed, 5 insertions, 4 deletions
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 340d14bafe..4daf225104 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 <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180824230844.12428-1-dhinakaran.pandiyan@intel.com Acked-by: Thomas Zimmermann <tzimmermann@suse.de> --- - 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 <tzimmermann@suse.de> 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 <tzimmermann@suse.de> - 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) |