diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-05-17 16:07:50 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-05-19 15:37:27 +0300 |
| commit | afee4d8707ab1f21b7668de995be3a5961e83582 (patch) | |
| tree | 9f17afe2029eb65552efb2f9988a150c74d5c12b /drivers | |
| parent | 51cbaf010faea9409481bf7d18784d8cd62fcacb (diff) | |
| download | linux-afee4d8707ab1f21b7668de995be3a5961e83582.tar.xz | |
Revert "drm/i915: Avoid stalling on pending flips for legacy cursor updates"
This reverts commit acf4e84d6167317ff21be5c03e1ea76ea5783701.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ae253bb57c25..a432fdc6fe68 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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; |