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

Commit 38b6441e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/atomic-helper: Remove the backoff hack from set_config 



Another one bites the dust.

Again let's not forget to remove the temporary hidden acquire_ctx
assignment, now that we pass this all around explicitly it can go
away again.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-20-daniel.vetter@ffwll.ch
parent a4eff9aa

drivers/gpu/drm/drm_atomic_helper.c

+2 −19
Original line number Diff line number Diff line
@@ -2290,32 +2290,15 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set, 
		return -ENOMEM;



	state->legacy_set_config = true;

	state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc);

retry:

	state->acquire_ctx = ctx;

	ret = __drm_atomic_helper_set_config(set, state);

	if (ret != 0)

		goto fail;

		return ret;



	ret = drm_atomic_commit(state);

fail:

	if (ret == -EDEADLK)

		goto backoff;



	drm_atomic_state_put(state);

	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.

	 */

	crtc->primary->old_fb = crtc->primary->fb;



	goto retry;

}

EXPORT_SYMBOL(drm_atomic_helper_set_config);

drivers/gpu/drm/drm_crtc.c

+0 −1
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
	ret = drm_modeset_lock_all_ctx(crtc->dev, &ctx);

	if (ret)

		goto out;

	dev->mode_config.acquire_ctx = &ctx;

	if (crtc_req->mode_valid) {

		/* If we have a mode we need a framebuffer. */

		/* If we pass -1, set the mode with the currently bound fb */