On Thu, Sep 16, 2021 at 11:15:38PM +0200, Fernando Ramos wrote:
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()
Hi Fernando, Thank you for your patch. Could you please fix the subject, changing dmr to drm?
Signed-off-by: Fernando Ramos greenfoo@u92.eu
drivers/gpu/drm/drm_client_modeset.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c index ced09c7c06f9..5f5184f071ed 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -574,6 +574,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, int num_connectors_detected = 0; int num_tiled_conns = 0; struct drm_modeset_acquire_ctx ctx;
- int err;
I think you can just reuse 'ret' instead of creating a new variable. That ensures if the lock fails we return the error from the macros.
Sean
if (!drm_drv_uses_atomic_modeset(dev)) return false; @@ -585,10 +586,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, if (!save_enabled) return false;
- drm_modeset_acquire_init(&ctx, 0);
- while (drm_modeset_lock_all_ctx(dev, &ctx) != 0)
drm_modeset_backoff(&ctx);
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err);
memcpy(save_enabled, enabled, count); mask = GENMASK(count - 1, 0);
@@ -743,8 +741,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, ret = false; }
- drm_modeset_drop_locks(&ctx);
- drm_modeset_acquire_fini(&ctx);
DRM_MODESET_LOCK_ALL_END(dev, ctx, err);
kfree(save_enabled); return ret;
-- 2.33.0