From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8465A26739B for ; Thu, 13 Mar 2025 12:00:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867241; cv=none; b=J9LKxDPi7qnKng+2tn9U/DRvhaaToq4WFfWIMoDpe1OLLPadVgXZ9gXdRvBG9jUhGzIzZ7l5V1wWha6MUR3Cw7pbPYhY0ilbnBQRhT6KBtHrfLUfNp4a4ZeXsI/VxFzZ509IlRB+BdgzxScJW37HTGKaBIZ1SPmjC1bD5oNO+T8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741867241; c=relaxed/simple; bh=QLjBmBTGFfvbamTwOqNwPh8p1mjv/71jpgSOsVZUA0U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Uroe7Ukx/qAt8Sfi2dUGsyL340BSdlG0HpZu4XFySD6lO7yvOSN/KNxW3CJMFKvjL3MGGB6IIjlWDN9htRW5ZE9+PX4ChzbD2GN1Mn0xR1XcxHLx2EPfJbYCfOc+/lepMF8dFbaUtI3N6lnqZ8EDoyO3jnbLpvgTeG98SVDkNIQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W2O4IuLt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W2O4IuLt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1158AC4CEDD; Thu, 13 Mar 2025 12:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741867241; bh=QLjBmBTGFfvbamTwOqNwPh8p1mjv/71jpgSOsVZUA0U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=W2O4IuLt4EI8XYUmU3AyzT4SNvo4QGX34YQf1DaVVDH5GTR618Z6uTPCfmbmTQrt5 T5Vhnv4gEEQDVOySY3wAa9PciJ547m/I3BjuoEojBB/QLQKzB8AY2P0f8+HdHuBgAp 9X3hdpfWoY/465L2rVxrmnj9ofnJeLs0qBdC501RoJy9W87+o36ihXFiIU6eTP7AQP 8M896NdgOMYjhCh3i5/PxPWdzpU47XSUe5TNJ3W/Uehm8BQGU6FfjjYQUx3UXNNNR9 hAf8S+nwymhNQow9Khef3Kn5fRGtV9vMLpAmX9oIt5Cl4L4rXqUiGnSdG270JP4wn0 3T9SSc0H3g+yw== From: Maxime Ripard Date: Thu, 13 Mar 2025 13:00:04 +0100 Subject: [PATCH v6 10/16] drm/bridge: ti-sn65dsi83: Switch to drm_bridge_helper_reset_crtc Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250313-bridge-connector-v6-10-511c54a604fb@kernel.org> References: <20250313-bridge-connector-v6-0-511c54a604fb@kernel.org> In-Reply-To: <20250313-bridge-connector-v6-0-511c54a604fb@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Douglas Anderson Cc: Herve Codina , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2594; i=mripard@kernel.org; h=from:subject:message-id; bh=QLjBmBTGFfvbamTwOqNwPh8p1mjv/71jpgSOsVZUA0U=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDOmXThz5ZsSn+yhCV1nfIkBbI2fVfheP1UvzrjIrmswye da/Jcmuo5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABOZfJzhD2+B972lLh6PpY8u XXXxgE2w+ddVaht+HJ4RvWtq/+vEP7sY/hfPeX/z3mb+vOMuMve23GBUcnfOyQqflckYeuhEpX+ xFT8A X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Now that we have a helper for bridge drivers to call to reset the output pipeline, let's use it. Reviewed-by: Dmitry Baryshkov Reviewed-by: Herve Codina Tested-by: Herve Codina Signed-off-by: Maxime Ripard --- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c index 7122a3ebd88399ed32420fcaf9f1f9384d031d2d..53cc4cfb0c884f6a410e3df2c4df4572f89c0768 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c @@ -38,11 +38,11 @@ #include #include #include #include -#include /* DRM_MODESET_LOCK_ALL_BEGIN() needs drm_drv_uses_atomic_modeset() */ +#include #include #include #include #include @@ -369,11 +369,10 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx) return dsi_div - 1; } static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83) { - struct drm_device *dev = sn65dsi83->bridge.dev; struct drm_modeset_acquire_ctx ctx; int err; /* * Reset active outputs of the related CRTC. @@ -384,30 +383,25 @@ static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83) * bridge. * * Keep the lock during the whole operation to be atomic. */ - DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err); - - if (!sn65dsi83->bridge.encoder->crtc) { - /* - * No CRTC attached -> No CRTC active outputs to reset - * This can happen when the SN65DSI83 is reset. Simply do - * nothing without returning any errors. - */ - err = 0; - goto end; - } + drm_modeset_acquire_init(&ctx, 0); dev_warn(sn65dsi83->dev, "reset the pipe\n"); - err = drm_atomic_helper_reset_crtc(sn65dsi83->bridge.encoder->crtc, &ctx); +retry: + err = drm_bridge_helper_reset_crtc(&sn65dsi83->bridge, &ctx); + if (err == -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry; + } -end: - DRM_MODESET_LOCK_ALL_END(dev, ctx, err); + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); - return err; + return 0; } static void sn65dsi83_reset_work(struct work_struct *ws) { struct sn65dsi83 *ctx = container_of(ws, struct sn65dsi83, reset_work); -- 2.48.1