Skip to content

media: apple: isp: bound exposure metadata and keep controls gated #978

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

Draft
satchlj wants to merge 6 commits into
base: integration/aurora
Choose a base branch
from
Draft

media: apple: isp: bound exposure metadata and keep controls gated #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16e17fc
Prepare the original context for the carried ISP metadata bounds work
satchlj Nov 5, 2026
ba71c00
media: apple: isp: report the frame gain and exposure
RyanTheTide Oct 31, 2026
d83a42a
media: apple: isp: compose metadata bounds with Aurora capture support
satchlj Nov 5, 2026
5db86ad
Merge commit '33313096c66f4afdff4ef7060d20fe9bedebc34c' into satchlj/…
satchlj Nov 5, 2026
1027889
Merge commit 'b50066848322c6799c1433ee3a358aab2e9faabb' into satchlj/…
satchlj Nov 5, 2026
76db723
media: apple: isp: keep exposure controls gated in the helper
satchlj Nov 5, 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
32 changes: 32 additions & 0 deletions drivers/media/platform/apple/isp/isp-v4l2-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,14 @@ static void isp_test_meta_exposure(struct kunit *test)
KUNIT_EXPECT_EQ(test, isp->frame_exposure_us, 32475);
KUNIT_EXPECT_EQ(test, isp->frame_gain, 3253);

/* A short header cannot supply the section-table entry. */
put_unaligned_le16(700, virt + 0x1876);
meta.size = 0x1f;
isp_meta_read_exposure(isp, &meta);
KUNIT_EXPECT_EQ(test, isp->frame_gain, 3253);
meta.size = 0x2000;
put_unaligned_le16(3253, virt + 0x1876);

/* a section that would end past the buffer is ignored */
put_unaligned_le32(meta.size - 4, virt + 0x1c);
put_unaligned_le32(1000, virt + meta.size - 4);
Expand All @@ -393,8 +401,32 @@ static void isp_test_meta_exposure(struct kunit *test)
KUNIT_EXPECT_EQ(test, isp->frame_gain, 600);
}

static void isp_test_exposure_control_gate(struct kunit *test)
{
static const struct apple_isp_hw hw_none = { };
static const struct apple_isp_hw hw = { .meta_exposure = true };
struct apple_isp *isp = isp_test_alloc(test);

v4l2_ctrl_handler_init(&isp->ctrl_handler, 3);
isp->hw = &hw_none;
isp_init_exposure_ctrls(isp);
KUNIT_EXPECT_PTR_EQ(test, isp->gain, NULL);
KUNIT_EXPECT_PTR_EQ(test, isp->exposure, NULL);
isp->hw = &hw;
isp_init_exposure_ctrls(isp);
KUNIT_EXPECT_EQ(test, isp->ctrl_handler.error, 0);
KUNIT_EXPECT_NOT_ERR_OR_NULL(test, isp->gain);
KUNIT_EXPECT_NOT_ERR_OR_NULL(test, isp->exposure);
if (isp->gain)
KUNIT_EXPECT_EQ(test, isp->gain->flags &
(V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE),
(u32)(V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE));
v4l2_ctrl_handler_free(&isp->ctrl_handler);
}

static struct kunit_case isp_v4l2_test_cases[] = {
KUNIT_CASE(isp_test_meta_exposure),
KUNIT_CASE(isp_test_exposure_control_gate),
KUNIT_CASE(isp_test_imx958_last_lease_requeue),
KUNIT_CASE(isp_test_p010_report_defers_completion),
KUNIT_CASE(isp_test_p010_mode_selection),
Expand Down
6 changes: 5 additions & 1 deletion drivers/media/platform/apple/isp/isp-v4l2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ static void isp_meta_read_exposure(struct apple_isp *isp,
u32 offset, time;
u16 gain;

if (!isp->hw->meta_exposure || !virt)
if (!isp->hw->meta_exposure || !virt ||
meta->size < ISP_META_SECTIONS + 4 * (ISP_META_SECTION_EXPOSURE + 1))
return;

offset = get_unaligned_le32(virt + ISP_META_SECTIONS +
Expand Down Expand Up @@ -1151,6 +1152,9 @@ static const struct v4l2_ctrl_ops isp_exposure_ctrl_ops = {
*/
static void isp_init_exposure_ctrls(struct apple_isp *isp)
{
if (!isp->hw->meta_exposure)
return;

isp->frame_gain = 256;
isp->gain = v4l2_ctrl_new_std(&isp->ctrl_handler,
&isp_exposure_ctrl_ops, V4L2_CID_GAIN,
Expand Down