mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
drm/atomic-helper: remove backoff hack from page_flip
Yay, we can now properly retry in case of deadlocks or whatever! Also don't forget to remove the transitional crtc->acquire_ctx assignment again. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-13-daniel.vetter@ffwll.ch
This commit is contained in:
parent
41292b1fa1
commit
043e7fb6e6
2 changed files with 2 additions and 39 deletions
|
@ -2884,34 +2884,16 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
|
||||||
if (!state)
|
if (!state)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc);
|
state->acquire_ctx = ctx;
|
||||||
|
|
||||||
retry:
|
|
||||||
ret = page_flip_common(state, crtc, fb, event, flags);
|
ret = page_flip_common(state, crtc, fb, event, flags);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
ret = drm_atomic_nonblocking_commit(state);
|
ret = drm_atomic_nonblocking_commit(state);
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
if (ret == -EDEADLK)
|
|
||||||
goto backoff;
|
|
||||||
|
|
||||||
drm_atomic_state_put(state);
|
drm_atomic_state_put(state);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
backoff:
|
|
||||||
drm_atomic_state_clear(state);
|
|
||||||
drm_atomic_legacy_backoff(state);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Someone might have exchanged the framebuffer while we dropped locks
|
|
||||||
* in the backoff code. We need to fix up the fb refcount tracking the
|
|
||||||
* core does for us.
|
|
||||||
*/
|
|
||||||
plane->old_fb = plane->fb;
|
|
||||||
|
|
||||||
goto retry;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_atomic_helper_page_flip);
|
EXPORT_SYMBOL(drm_atomic_helper_page_flip);
|
||||||
|
|
||||||
|
@ -2948,9 +2930,8 @@ int drm_atomic_helper_page_flip_target(
|
||||||
if (!state)
|
if (!state)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc);
|
state->acquire_ctx = ctx;
|
||||||
|
|
||||||
retry:
|
|
||||||
ret = page_flip_common(state, crtc, fb, event, flags);
|
ret = page_flip_common(state, crtc, fb, event, flags);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -2963,26 +2944,9 @@ int drm_atomic_helper_page_flip_target(
|
||||||
crtc_state->target_vblank = target;
|
crtc_state->target_vblank = target;
|
||||||
|
|
||||||
ret = drm_atomic_nonblocking_commit(state);
|
ret = drm_atomic_nonblocking_commit(state);
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
if (ret == -EDEADLK)
|
|
||||||
goto backoff;
|
|
||||||
|
|
||||||
drm_atomic_state_put(state);
|
drm_atomic_state_put(state);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
backoff:
|
|
||||||
drm_atomic_state_clear(state);
|
|
||||||
drm_atomic_legacy_backoff(state);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Someone might have exchanged the framebuffer while we dropped locks
|
|
||||||
* in the backoff code. We need to fix up the fb refcount tracking the
|
|
||||||
* core does for us.
|
|
||||||
*/
|
|
||||||
plane->old_fb = plane->fb;
|
|
||||||
|
|
||||||
goto retry;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);
|
EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);
|
||||||
|
|
||||||
|
|
|
@ -875,7 +875,6 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
|
||||||
ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
|
ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
crtc->acquire_ctx = &ctx;
|
|
||||||
|
|
||||||
if (crtc->primary->fb == NULL) {
|
if (crtc->primary->fb == NULL) {
|
||||||
/* The framebuffer is currently unbound, presumably
|
/* The framebuffer is currently unbound, presumably
|
||||||
|
|
Loading…
Reference in a new issue