drm/i915/display: replace boilerplate code with helper macros
PATCH 1/1 drm/i915/display: replace boilerplate code with helper macros
As per commit 22be87401289 ("drm: TODO: Add DRM_MODESET_LOCK_ALL* conversion to todo.rst"), drm_modeset_lock_all()/drm_modeset_unlock_all() and boilerplate code surronding instances of drm_modeset_lock_all_ctx() with a local acquire context should be replaced with the relevant helper macros.
Signed-off-by Hamza Mahfooz <[email protected]>
--- drivers/gpu/drm/i915/display/intel_display.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +7 -13
@@ -40,6 +40,7 @@#include <drm/drm_dp_helper.h> #include <drm/drm_edid.h> #include <drm/drm_fourcc.h> +#include "drm/drm_modeset_lock.h" #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_rect.h>
@@ -11836,6 +11837,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)struct drm_device *dev = &i915->drm;enum pipe pipe;struct intel_crtc *crtc; +struct drm_modeset_acquire_ctx ctx;int ret;intel_init_pm (i915);
@@ -11884,9 +11886,9 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)intel_vga_disable (i915);intel_setup_outputs (i915); -drm_modeset_lock_all (dev); +DRM_MODESET_LOCK_ALL_BEGIN (dev, ctx,0 , ret);intel_modeset_setup_hw_state (dev, dev->mode_config.acquire_ctx); -drm_modeset_unlock_all (dev); +DRM_MODESET_LOCK_ALL_END (dev, ctx, ret);for_each_intel_crtc (dev, crtc) {struct intel_initial_plane_config plane_config = {};
@@ -12795,22 +12797,14 @@ void intel_display_resume(struct drm_device *dev)if (state) state->acquire_ctx = &ctx; -drm_modeset_acquire_init (&ctx,0 ); - -while (1 ) { - ret =drm_modeset_lock_all_ctx (dev, &ctx); -if (ret != -EDEADLK ) -break ; - -drm_modeset_backoff (&ctx); - } +DRM_MODESET_LOCK_ALL_BEGIN (dev, ctx,0 , ret);if (!ret) ret =__intel_display_resume (dev, state, &ctx);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) drm_err(&dev_priv->drm,
Signature · 1 line
2.32.0