Skip to content

media: iris: Retain firmware confirmed video_format across GOP restarts #1121

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
gouravk-qualcomm wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+5 −1
Open

media: iris: Retain firmware confirmed video_format across GOP restarts #1121

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
1 change: 1 addition & 0 deletions drivers/media/platform/qcom/iris/iris_hfi_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ struct hfi_subscription_params {
u32 fw_min_count;
u32 pic_order_cnt;
u32 color_info;
u32 video_format;
u32 profile;
u32 level;
u32 tier;
Expand Down
3 changes: 2 additions & 1 deletion drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ static int iris_hfi_gen2_set_colorspace(struct iris_inst *inst, u32 plane)
struct v4l2_pix_format_mplane *pixmp = &inst->fmt_src->fmt.pix_mp;
u32 video_signal_type_present_flag = 0, color_info;
u32 matrix_coeff = HFI_MATRIX_COEFF_RESERVED;
u32 video_format = UNSPECIFIED_COLOR_FORMAT;
u32 video_format = inst_hfi_gen2->src_subcr_params.video_format;
u32 full_range = V4L2_QUANTIZATION_DEFAULT;
u32 transfer_char = HFI_TRANSFER_RESERVED;
u32 port = iris_hfi_gen2_get_port(inst, plane);
Expand Down Expand Up @@ -807,6 +807,7 @@ static int iris_hfi_gen2_session_open(struct iris_inst *inst)

inst_hfi_gen2->ipsc_properties_set = false;
inst_hfi_gen2->opsc_properties_set = false;
inst_hfi_gen2->src_subcr_params.video_format = UNSPECIFIED_COLOR_FORMAT;

inst_hfi_gen2->packet = kzalloc(4096, GFP_KERNEL);
if (!inst_hfi_gen2->packet)
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ static void iris_hfi_gen2_read_input_subcr_params(struct iris_inst *inst)
full_range = (subsc_params.color_info & 0x2000000) >> 25;
video_signal_type_present_flag =
(subsc_params.color_info & 0x20000000) >> 29;
inst_hfi_gen2->src_subcr_params.video_format =
(subsc_params.color_info & 0x1C000000) >> 26;

pixmp_op->colorspace = V4L2_COLORSPACE_DEFAULT;
pixmp_op->xfer_func = V4L2_XFER_FUNC_DEFAULT;
Expand Down