OSDN Git Service

drm/i915: Unset legacy_cursor_update early in intel_atomic_commit, v3.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 19 Sep 2017 12:14:18 +0000 (14:14 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 4 Oct 2017 07:16:21 +0000 (09:16 +0200)
commit3cf50c63a76177e0bbe0e46e1abe4eb263128ba4
treeecb5280eb9c4aa00b686ff36591ac20415771c2e
parent4672770d247806551de4aee6619d4f097eed155a
drm/i915: Unset legacy_cursor_update early in intel_atomic_commit, v3.

Commit b44d5c0c105a ("drm/i915: Always wait for flip_done, v2.") removed
the call to wait_for_vblanks and replaced it with flip_done.

Unfortunately legacy_cursor_update was unset too late, and the
replacement call drm_atomic_helper_wait_for_flip_done() was
a noop. Make sure that its unset before setup_commit() is
called to fix this issue.

Changes since v1:
- Force vblank wait for watermarks not yet converted to atomic too. (Ville)
- Use for_each_new_intel_crtc_in_state. (Ville)
Changes since v2:
- Move the optimization to a separate commit. (Ville)

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: b44d5c0c105a ("drm/i915: Always wait for flip_done, v2.")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102675
Testcase: kms_cursor_crc
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reported-by: Marta Löfstedt <marta.lofstedt@intel.com>
Cc: Marta Löfstedt <marta.lofstedt@intel.com>
Tested-by: Marta Löfstedt <marta.lofstedt@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170919121419.13708-1-maarten.lankhorst@linux.intel.com
drivers/gpu/drm/i915/intel_display.c