Skip to content

Correctly unbind CFE #7624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naushir merged 3 commits into from
Sep 15, 2026
+25 −0
Merged

Correctly unbind CFE #7624

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bcc8e5
media: rp1-cfe: Release the vb2 queue when unregistering a node
naushir Sep 14, 2026
5dcea63
media: rp1-cfe: Reset the video_device before re-registering it
naushir Sep 14, 2026
ded793e
media: rp1-cfe: Add an unbind callback to tear down the graph
naushir Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,13 @@ static int cfe_register_node(struct cfe_device *cfe, int id)
struct cfe_node *node = &cfe->node[id];
int ret;

/*
* The node may be re-registered after the source subdev has been
* unbound and rebound. The embedded video_device must be reset before
* being re-registered.
*/
memset(&node->video_dev, 0, sizeof(node->video_dev));

node->cfe = cfe;
node->id = id;

Expand Down Expand Up @@ -2038,6 +2045,7 @@ static void cfe_unregister_nodes(struct cfe_device *cfe)
if (check_state(cfe, NODE_REGISTERED, i)) {
clear_state(cfe, NODE_REGISTERED, i);
video_unregister_device(&node->video_dev);
vb2_queue_release(&node->buffer_queue);
}
}
}
Expand Down Expand Up @@ -2168,6 +2176,22 @@ static int cfe_async_bound(struct v4l2_async_notifier *notifier,
return 0;
}

static void cfe_async_unbind(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev,
struct v4l2_async_connection *asd)
{
struct cfe_device *cfe = to_cfe_device(notifier->v4l2_dev);

if (cfe->sensor != subdev)
return;

cfe_unregister_nodes(cfe);
media_entity_remove_links(&cfe->csi2.sd.entity);
media_entity_remove_links(&cfe->fe.sd.entity);

cfe->sensor = NULL;
}

static int cfe_async_complete(struct v4l2_async_notifier *notifier)
{
struct cfe_device *cfe = to_cfe_device(notifier->v4l2_dev);
Expand All @@ -2177,6 +2201,7 @@ static int cfe_async_complete(struct v4l2_async_notifier *notifier)

static const struct v4l2_async_notifier_operations cfe_async_ops = {
.bound = cfe_async_bound,
.unbind = cfe_async_unbind,
.complete = cfe_async_complete,
};

Expand Down
Loading