Skip to content

Commit

Permalink
drm/bridge: sn65dsi83: Switch to devm MIPI-DSI helpers
Browse files Browse the repository at this point in the history
Let's switch to the new devm MIPI-DSI function to register and attach
our secondary device. This also avoids leaking the device when we detach
the bridge but don't remove its driver.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-15-maxime@cerno.tech
  • Loading branch information
Maxime Ripard committed Oct 27, 2021
1 parent c05f1a4 commit 6cae235
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/gpu/drm/bridge/ti-sn65dsi83.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ static int sn65dsi83_attach(struct drm_bridge *bridge,
return -EPROBE_DEFER;
}

dsi = mipi_dsi_device_register_full(host, &info);
dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
if (IS_ERR(dsi)) {
return dev_err_probe(dev, PTR_ERR(dsi),
"failed to create dsi device\n");
Expand All @@ -274,18 +274,14 @@ static int sn65dsi83_attach(struct drm_bridge *bridge,
dsi->format = MIPI_DSI_FMT_RGB888;
dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST;

ret = mipi_dsi_attach(dsi);
ret = devm_mipi_dsi_attach(dev, dsi);
if (ret < 0) {
dev_err(dev, "failed to attach dsi to host\n");
goto err_dsi_attach;
return ret;
}

return drm_bridge_attach(bridge->encoder, ctx->panel_bridge,
&ctx->bridge, flags);

err_dsi_attach:
mipi_dsi_device_unregister(dsi);
return ret;
}

static void sn65dsi83_detach(struct drm_bridge *bridge)
Expand All @@ -295,8 +291,6 @@ static void sn65dsi83_detach(struct drm_bridge *bridge)
if (!ctx->dsi)
return;

mipi_dsi_detach(ctx->dsi);
mipi_dsi_device_unregister(ctx->dsi);
ctx->dsi = NULL;
}

Expand Down

0 comments on commit 6cae235

Please sign in to comment.