Skip to content

arm64: dts: apple: t604x-j614-j616: scale the 720p camera preset #1005

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
RyanTheTide merged 1 commit into from
Nov 6, 2026
Merged

arm64: dts: apple: t604x-j614-j616: scale the 720p camera preset #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4483,12 +4483,12 @@
apple,output-size = <1920 1080>;
apple,crop = <0 0 1920 1080>;
};
/* 1280x720 */
/* 1280x720: the same window as 1920x1080, scaled down */
preset1 {
apple,config-index = <5>;
apple,input-size = <1920 2160>;
apple,output-size = <1280 720>;
apple,crop = <0 0 1280 720>;
apple,crop = <0 0 1920 1080>;
};
};
};
Expand Down
6 changes: 4 additions & 2 deletions drivers/media/platform/apple/isp/isp-cam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,10 @@ static int isp_ch_cache_sensor_configs(struct apple_isp *isp, u32 ch, u32 count)
preset->input_dim.x == config->in_width &&
preset->input_dim.y == config->in_height &&
!preset->crop_offset.x && !preset->crop_offset.y &&
preset->crop_size.x == preset->output_dim.x &&
preset->crop_size.y == preset->output_dim.y)
/* Same aspect ratio, never enlarged: the scaler may shrink it. */
preset->crop_size.x >= preset->output_dim.x &&
preset->crop_size.x * preset->output_dim.y ==
preset->crop_size.y * preset->output_dim.x)
preset->p010 = preview || reported;
}
if (!cached->usable)
Expand Down