The state comparison infrastructure will need to know if a commit is blocking or non-blocking in commit_tail. Pass the nonblock flag along.
Reviewed-by: Thomas Zimmermann <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 285aac3554df..6405afc5037d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2035,11 +2035,11 @@ void drm_atomic_helper_commit_tail_rpm(struct drm_atomic_commit *state) drm_atomic_helper_cleanup_planes(dev, state); } EXPORT_SYMBOL(drm_atomic_helper_commit_tail_rpm); -static void commit_tail(struct drm_atomic_commit *state) +static void commit_tail(struct drm_atomic_commit *state, bool nonblock) { struct drm_device *dev = state->dev; const struct drm_mode_config_helper_funcs *funcs; struct drm_crtc_state *new_crtc_state; struct drm_crtc *crtc; @@ -2093,11 +2093,11 @@ static void commit_tail(struct drm_atomic_commit *state) static void commit_work(struct work_struct *work) { struct drm_atomic_commit *state = container_of(work, struct drm_atomic_commit, commit_work); - commit_tail(state); + commit_tail(state, true); } /** * drm_atomic_helper_async_check - check if state can be committed asynchronously * @dev: DRM device @@ -2313,11 +2313,11 @@ int drm_atomic_helper_commit(struct drm_device *dev, drm_atomic_commit_get(state); if (nonblock) queue_work(system_dfl_wq, &state->commit_work); else - commit_tail(state); + commit_tail(state, false); return 0; err: drm_atomic_helper_unprepare_planes(dev, state); -- 2.54.0
