From c5d87e4d558328335e09387dea495dc2957c436d Mon Sep 17 00:00:00 2001 From: Jim Rees 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 --- 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 f0b9aa7a0483..b140041b6c73 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14349,8 +14349,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); @@ -14477,8 +14475,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); @@ -14486,8 +14482,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 @@ -14571,10 +14565,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.11.0