mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
drm/i915: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()
As requested in Documentation/gpu/todo.rst, replace the boilerplate code surrounding drm_modeset_lock_all_ctx() with DRM_MODESET_LOCK_ALL_BEGIN() and DRM_MODESET_LOCK_ALL_END() Signed-off-by: Fernando Ramos <greenfoo@u92.eu> Reviewed-by: Sean Paul <sean@poorly.run> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210924064324.229457-3-greenfoo@u92.eu
This commit is contained in:
parent
21dde40902
commit
399190e708
1 changed files with 5 additions and 13 deletions
|
@ -43,6 +43,7 @@
|
||||||
#include <drm/drm_plane_helper.h>
|
#include <drm/drm_plane_helper.h>
|
||||||
#include <drm/drm_probe_helper.h>
|
#include <drm/drm_probe_helper.h>
|
||||||
#include <drm/drm_rect.h>
|
#include <drm/drm_rect.h>
|
||||||
|
#include <drm/drm_drv.h>
|
||||||
|
|
||||||
#include "display/intel_audio.h"
|
#include "display/intel_audio.h"
|
||||||
#include "display/intel_crt.h"
|
#include "display/intel_crt.h"
|
||||||
|
@ -13476,22 +13477,13 @@ void intel_display_resume(struct drm_device *dev)
|
||||||
if (state)
|
if (state)
|
||||||
state->acquire_ctx = &ctx;
|
state->acquire_ctx = &ctx;
|
||||||
|
|
||||||
drm_modeset_acquire_init(&ctx, 0);
|
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
|
||||||
|
|
||||||
while (1) {
|
ret = __intel_display_resume(dev, state, &ctx);
|
||||||
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);
|
intel_enable_ipc(dev_priv);
|
||||||
drm_modeset_drop_locks(&ctx);
|
|
||||||
drm_modeset_acquire_fini(&ctx);
|
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
drm_err(&dev_priv->drm,
|
drm_err(&dev_priv->drm,
|
||||||
|
|
Loading…
Reference in a new issue