Attachment 130168 Details for Bug 96781 – 4.11.0-rc1: drm/i915: Revert ea0000f0 "Roll out the helper nonblock tracking"

[patch] 4.11.0-rc1: drm/i915: Revert ea0000f0 "Roll out the helper nonblock tracking"

0001-drm-i915-Revert-ea0000f0-4.11 (text/plain), 2.21 KB, created by Jim Rees on 2017-03-12 04:33:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Rees

Created: 2017-03-12 04:33:14 UTC

Size: 2.21 KB

patch

obsolete

>From 310483a5292cf3a24295a3fc6703359a482acb87 Mon Sep 17 00:00:00 2001
>From: Jim Rees <rees@umich.edu>
>Date: Sat, 19 Nov 2016 14:13:20 -0500
>Subject: [PATCH] drm/i915: Revert ea0000f0 "Roll out the helper nonblock
> tracking"
>
>Commit ea0000f0 has been causing multiple problems for i915 users. See for
>example:
>
>https://bugs.freedesktop.org/show_bug.cgi?id=96781
>https://bugs.freedesktop.org/show_bug.cgi?id=97529
>https://bugzilla.redhat.com/show_bug.cgi?id=1385228
>https://forums.opensuse.org/showthread.php/520969-drm-915-Resetting-chip-after-gpu-hang
>
>Those last two are not confirmed but look like the same problem.
>
>Signed-off-by: Jim Rees <rees@umich.edu>
>---
> drivers/gpu/drm/i915/intel_display.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 01341670738f..d38fbf6eb216 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -14392,8 +14392,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
> 	unsigned crtc_vblank_mask = 0;
> 	int i;
> 
>-	drm_atomic_helper_wait_for_dependencies(state);
>-
> 	if (intel_state->modeset)
> 		intel_display_power_get(dev_priv, POWER_DOMAIN_MODESET);
> 
>@@ -14520,8 +14518,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
> 	if (intel_state->modeset && intel_can_enable_sagv(state))
> 		intel_enable_sagv(dev_priv);
> 
>-	drm_atomic_helper_commit_hw_done(state);
>-
> 	if (intel_state->modeset)
> 		intel_display_power_put(dev_priv, POWER_DOMAIN_MODESET);
> 
>@@ -14529,8 +14525,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
> 	drm_atomic_helper_cleanup_planes(dev, state);
> 	mutex_unlock(&dev->struct_mutex);
> 
>-	drm_atomic_helper_commit_cleanup_done(state);
>-
> 	drm_atomic_state_put(state);
> 
> 	/* As one of the primary mmio accessors, KMS has a high likelihood
>@@ -14614,10 +14608,6 @@ static int intel_atomic_commit(struct drm_device *dev,
> 	struct drm_i915_private *dev_priv = to_i915(dev);
> 	int ret = 0;
> 
>-	ret = drm_atomic_helper_setup_commit(state, nonblock);
>-	if (ret)
>-		return ret;
>-
> 	drm_atomic_state_get(state);
> 	i915_sw_fence_init(&intel_state->commit_ready,
> 			   intel_atomic_commit_ready);
>-- 
>2.12.0
>

Actions: View | Splinter Review

Attachments on bug 96781: 127582 | 127741 | 128085 | 128603 | 128686 | 128882 | 129266 | 129434 | 129979 | 130168 | 131280 | 131591

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.