Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c01ded5 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Use atomic page flip for intel again. 



This reverts commit 527b6abe
(Revert "drm/i915: Use atomic commits for legacy page_flips")

and reapplies commit ee042aa4.
("drm/i915: Use atomic commits for legacy page_flips")

The reason for the revert was because legacy cursor updates were
forced to wait for pending page flips and rendering after they
were converted to atomic.

Commit f79f2692
(drm/i915: Add a cursor hack to allow converting legacy page flip to atomic, v3)
adds a fastpath to cursor updates, which fixes the stuttering issues.
With these changes I feel confident enough to re-enable cursor updates.

Legacy cursor update won't block in the following cases:
- Moving cursor
- Changing cursor fb

The legacy cursor update will still block in the following cases:
- Showing/hiding cursor.
- Cursor size or scaling changes.
- cursor update while cursor is invisible (could be fixed, if it turns out to be important).
- Cursor tiling changes (Not sure we support tiled cursors.)
- Last update was a modeset.

Cc: Steven Newbury <steve@snewbury.org.uk>
Cc: Rafael Ristovski <rafael.ristovski@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: default avatarRafael Ristovski <rafael.ristovski@gmail.com>
Testcase: igt/kms_cursor_legacy
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 86aa7e76

drivers/gpu/drm/i915/intel_display.c

+2 −1
Original line number Diff line number Diff line
@@ -12146,6 +12146,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe) 
	spin_unlock(&dev->event_lock);

}



__maybe_unused

static int intel_crtc_page_flip(struct drm_crtc *crtc,

				struct drm_framebuffer *fb,

				struct drm_pending_vblank_event *event,
@@ -14732,7 +14733,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { 
	.set_config = drm_atomic_helper_set_config,

	.set_property = drm_atomic_helper_crtc_set_property,

	.destroy = intel_crtc_destroy,

	.page_flip = intel_crtc_page_flip,

	.page_flip = drm_atomic_helper_page_flip,

	.atomic_duplicate_state = intel_crtc_duplicate_state,

	.atomic_destroy_state = intel_crtc_destroy_state,

	.set_crc_source = intel_crtc_set_crc_source,