Skip to content

Commit

Permalink
Revert "drm/i915: Avoid stalling on pending flips for legacy cursor u…
Browse files Browse the repository at this point in the history
…pdates"

This reverts commit acf4e84.
Unfortunately this breaks the next commit with a use-after-free, so
temporarily revert until we can apply a solution.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463490484-19540-8-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
  • Loading branch information
Maarten Lankhorst committed May 19, 2016
1 parent 51cbaf0 commit afee4d8
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -13395,9 +13395,6 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
}

for_each_crtc_in_state(state, crtc, crtc_state, i) {
if (state->legacy_cursor_update)
continue;

ret = intel_crtc_wait_for_pending_flips(crtc);
if (ret)
return ret;
Expand Down

0 comments on commit afee4d8

Please sign in to comment.