Commit 369de54e authored by Sean Paul's avatar Sean Paul
Browse files

Revert "drm/i915: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()" 



This reverts commit 399190e7.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fernando Ramos <greenfoo@u92.eu>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-15-sean@poorly.run
parent f505495d

drivers/gpu/drm/i915/display/intel_display.c

+13 −5
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_rect.h>

#include <drm/drm_drv.h>



#include "display/intel_audio.h"

#include "display/intel_crt.h"
@@ -13477,13 +13476,22 @@ void intel_display_resume(struct drm_device *dev) 
	if (state)

		state->acquire_ctx = &ctx;



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_acquire_init(&ctx, 0);



	while (1) {

		ret = drm_modeset_lock_all_ctx(dev, &ctx);

		if (ret != -EDEADLK)

			break;



		drm_modeset_backoff(&ctx);

	}



	if (!ret)

		ret = __intel_display_resume(dev, state, &ctx);



	intel_enable_ipc(dev_priv);



	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_drop_locks(&ctx);

	drm_modeset_acquire_fini(&ctx);



	if (ret)

		drm_err(&dev_priv->drm,