[CI-only 4/4] drm/i915: Hack to check use-after-free aggressively, and undo purpose of patches

[Maarten Lankhorst]

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_crtc.c   | 2 +-
 drivers/gpu/drm/i915/display/intel_cursor.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 558e9b7404b5..0ec6c3a79ec1 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -640,7 +640,7 @@ void intel_pipe_update_end(struct intel_atomic_state *state,
 			if (old_plane_state->uapi.crtc == &crtc->base &&
 			    old_plane_state->unpin_work.vblank) {
 				drm_vblank_work_schedule(&old_plane_state->unpin_work,
-							 drm_crtc_accurate_vblank_count(&crtc->base) + 1,
+							 drm_crtc_accurate_vblank_count(&crtc->base),
 							 false);
 
 				/* Remove plane from atomic state, cleanup/free is done from vblank worker. */
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index e999ee8e9d94..f052c25b0675 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -833,7 +833,7 @@ intel_legacy_cursor_update(struct drm_plane *_plane,
 				     intel_cursor_unpin_work);
 
 		drm_vblank_work_schedule(&old_plane_state->unpin_work,
-					 drm_crtc_accurate_vblank_count(&crtc->base) + 1,
+					 drm_crtc_accurate_vblank_count(&crtc->base),
 					 false);
 
 		old_plane_state = NULL;
-- 
2.43.0