github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/bridge: ti-sn65dsi83: Switch to drm_bridge_helper_reset_crtc

Browse Source 
Now that we have a helper for bridge drivers to call to reset the output
pipeline, let's use it.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Herve Codina <herve.codina@bootlin.com>
Tested-by: Herve Codina <herve.codina@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250313-bridge-connector-v6-10-511c54a604fb@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
Maxime Ripard 2025-03-13 13:00:04 +01:00
parent d4dfff472e
commit e17fadff7a
No known key found for this signature in database
GPG Key ID: 275FCE19A23DBE76
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/bridge/ti-sn65dsi83.c
View File

@ -40,7 +40,7 @@
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h> #include <drm/drm_bridge.h>
#include <drm/drm_drv.h> /* DRM_MODESET_LOCK_ALL_BEGIN() needs drm_drv_uses_atomic_modeset() */ #include <drm/drm_bridge_helper.h>
#include <drm/drm_mipi_dsi.h> #include <drm/drm_mipi_dsi.h>
#include <drm/drm_of.h> #include <drm/drm_of.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
@ -371,7 +371,6 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx)
static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83) static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83)
{ {
struct drm_device *dev = sn65dsi83->bridge.dev;
struct drm_modeset_acquire_ctx ctx; struct drm_modeset_acquire_ctx ctx;
int err; int err;
@ -386,26 +385,21 @@ static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83)
* Keep the lock during the whole operation to be atomic. * Keep the lock during the whole operation to be atomic.
*/ */
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err); drm_modeset_acquire_init(&ctx, 0);
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;
}
dev_warn(sn65dsi83->dev, "reset the pipe\n"); 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_drop_locks(&ctx);
DRM_MODESET_LOCK_ALL_END(dev, ctx, err); drm_modeset_acquire_fini(&ctx);
return err; return 0;
} }
static void sn65dsi83_reset_work(struct work_struct *ws) static void sn65dsi83_reset_work(struct work_struct *ws)