Skip to content

media: rockchip: fix camera format negotiation on Linux 6.6 #385

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

Open
ocd0711 wants to merge 3 commits into
base: develop-6.6
Choose a base branch
from
+13 −1
Open

media: rockchip: fix camera format negotiation on Linux 6.6 #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5280f3f
phy: rockchip: csi2-dphy: initialize sensor format request
Oct 22, 2025
3a3f987
media: rockchip: cif: zero-initialize subdev format
ocd0711 Aug 20, 2026
94ed40a
media: rockchip: cif: guard against NULL input formats
ocd0711 Aug 20, 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
12 changes: 11 additions & 1 deletion drivers/media/platform/rockchip/cif/capture.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,11 @@ static int rkcif_output_fmt_check(struct rkcif_stream *stream,
int ret = -EINVAL;

stream->rounding_bit = 0;
if (!input_fmt) {
v4l2_err(&stream->cifdev->v4l2_dev, "Input fmt is NULL\n");
return -EINVAL;
}

switch (input_fmt->mbus_code) {
case MEDIA_BUS_FMT_YUYV8_2X8:
case MEDIA_BUS_FMT_YVYU8_2X8:
Expand Down Expand Up @@ -982,7 +987,7 @@ const struct
cif_input_fmt *rkcif_get_input_fmt(struct rkcif_device *dev, struct v4l2_rect *rect,
u32 pad_id, struct csi_channel_info *csi_info)
{
struct v4l2_subdev_format fmt;
struct v4l2_subdev_format fmt = {0};
struct v4l2_subdev *sd = dev->terminal_sensor.sd;
struct rkmodule_channel_info ch_info = {0};
struct rkmodule_capture_info capture_info;
Expand Down Expand Up @@ -8805,6 +8810,11 @@ int rkcif_set_fmt(struct rkcif_stream *stream,
cif_fmt_in = rkcif_get_input_fmt(dev,
&input_rect, stream->id,
channel_info);
if (!cif_fmt_in) {
v4l2_err(&stream->cifdev->v4l2_dev,
"terminal sensor fmt invalid\n");
return -EINVAL;
}
stream->cif_fmt_in = cif_fmt_in;
} else {
v4l2_err(&stream->cifdev->v4l2_dev,
Expand Down
2 changes: 2 additions & 0 deletions drivers/phy/rockchip/phy-rockchip-csi2-dphy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,8 @@ static int csi2_dphy_get_set_fmt(struct v4l2_subdev *sd,
sensor = sd_to_sensor(dphy, sensor_sd);
if (!sensor)
return -ENODEV;
fmt->pad = 0;
fmt->which = V4L2_SUBDEV_FORMAT_ACTIVE;
ret = v4l2_subdev_call(sensor_sd, pad, get_fmt, NULL, fmt);
if (!ret && fmt->pad == 0 && fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE)
sensor->format = fmt->format;
Expand Down