Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion drivers/media/platform/apple/isp/isp-drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,10 +421,18 @@
if (err)
isp->temporal_filter = 0;

/* J613 firmware 14.7 stalls capture with temporal filter 1. */
if (of_machine_is_compatible("apple,j613") &&
isp->fw_compat == ISP_FIRMWARE_V_14_7 &&
isp->temporal_filter == 1) {
dev_info(dev, "using temporal filter 0 on J613 firmware 14.7\n");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this gates on ISP firmware-compat, not the OS firmware version, so "firmware-compat 14.7" here and in the comment at :424 would be more precise.

isp->temporal_filter = 0;
}

err = apple_isp_init_presets(isp);
if (err) {
dev_err(dev, "failed to initialize presets\n");
goto free_isp;

Check warning on line 435 in drivers/media/platform/apple/isp/isp-drv.c

View workflow job for this annotation

GitHub Actions / ci / commits

checkpatch NO_AUTHOR_SIGN_OFF (4433ef5a0ded)

Missing Signed-off-by: line by nominal patch author 'garymeyerca <220751193+garymeyerca@users.noreply.github.com>'
}

err = apple_isp_attach_genpd(isp);
Expand Down Expand Up @@ -670,11 +678,11 @@
.scl1 = true,
.lpdp = true,
.meta_size = ISP_META_SIZE_T8112,
};

Check warning on line 681 in drivers/media/platform/apple/isp/isp-drv.c

View workflow job for this annotation

GitHub Actions / ci / commits

checkpatch NO_AUTHOR_SIGN_OFF (6b3404044e17)

Missing Signed-off-by: line by nominal patch author 'garymeyerca <220751193+garymeyerca@users.noreply.github.com>'

static const struct apple_isp_hw apple_isp_hw_t8122 = {
.gen = ISP_GEN_T8112,
.pmu_base = 0x2d07040000,
.pmu_base = 0x2d0704000,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right: PMGR 0x2d0700000 + ps_isp_set0 0x4000. Could the commit carry Fixes: f26396997e09 ("media: apple: isp: add t8122 support")?


.dsid_count = 1,
.dsid_clr_base0 = 0x2221c4000,
Expand Down
Loading