Attachment 128603 Details for Bug 96781 – [PATCH] drm/i915: Revert ea0000f0 "Roll out the helper nonblock tracking"

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

0001-drm-i915-Revert-ea0000f0-Roll-out-the-helper-nonbloc.patch (text/plain), 2.26 KB, created by Jim Rees on 2016-12-21 12:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Rees

Created: 2016-12-21 12:29:44 UTC

Size: 2.26 KB

patch

obsolete

>From 39f1f985dfe5fb10963f13b93d4df205d10b0875 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.
>
>This has only been lightly tested and probably shouldn't go upstream yet.
>
>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 3cb70d73239b..699a8c85e27c 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -14347,8 +14347,6 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
> 		WARN_ON(ret);
> 	}
> 
>-	drm_atomic_helper_wait_for_dependencies(state);
>-
> 	if (intel_state->modeset) {
> 		memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
> 		       sizeof(intel_state->min_pixclk));
>@@ -14471,8 +14469,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);
> 
>@@ -14480,8 +14476,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_free(state);
> 
> 	/* As one of the primary mmio accessors, KMS has a high likelihood
>@@ -14547,10 +14541,6 @@ static int intel_atomic_commit(struct drm_device *dev,
> 		return -EINVAL;
> 	}
> 
>-	ret = drm_atomic_helper_setup_commit(state, nonblock);
>-	if (ret)
>-		return ret;
>-
> 	INIT_WORK(&state->commit_work, intel_atomic_commit_work);
> 
> 	ret = intel_atomic_prepare_commit(dev, state, nonblock);
>-- 
>2.11.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.