media: qcom: iris: miscellaneous code-quality fixes
Subsystems (4)
Dikshita Agarwal
maintainercover media: qcom: iris: miscellaneous code-quality fixes
This series addresses a set of independent code-quality issues found during review of the Qualcomm iris video driver.
No functional changes are intended.
---
Dikshita Agarwal (7):
media: qcom: iris: Centralize internal buffer table selection
media: qcom: iris: fix state-change debug log printing stale value
media: qcom: iris: Fix bitmask test in iris_allow_cmd()
media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
media: qcom: iris: Remove duplicate HFI_PROP_OPB_ENABLE entry
media: qcom: iris: Add missing break in iris_hfi_gen2_session_set_codec()
media: qcom: iris: Make iris_destroy_internal_buffer() return void
drivers/media/platform/qcom/iris/iris_buffer.c | 123 +++++---------------- drivers/media/platform/qcom/iris/iris_buffer.h | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_hfi_gen2_command.c | 7 +- .../platform/qcom/iris/iris_hfi_gen2_response.c | 4 +- drivers/media/platform/qcom/iris/iris_state.c | 4 +- 6 files changed, 40 insertions(+), 102 deletions(-)
---
base-commit: 3b058d1aeeeff27a7289529c4944291613b364e9
change-id: 20260420-iris-code-improvement-19409f16258c
Best regards,
Signature · 1 line
Dikshita Agarwal <[email protected]>
Dikshita Agarwal
maintainerPATCH 1/7 media: qcom: iris: Centralize internal buffer table selection
Internal buffer table dispatch is duplicated across multiple Iris code paths, which is error‑prone and makes future changes harder to reason about.
Consolidate the buffer dispatch logic into a single helper so that table selection is defined in exactly one place and keep call sites minimal. No functional change intended.
--- drivers/media/platform/qcom/iris/iris_buffer.c | 107 ++++++------------------- 1 file changed, 26 insertions(+), 81 deletions(-)
drivers/media/platform/qcom/iris/iris_buffer.c +26 -81
@@ -299,39 +299,41 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, buffers->min_count =iris_vpu_buf_count (inst, buffer_type); } -void iris_get_internal_buffers (struct iris_inst *inst,u32 plane) +static void iris_get_int_buf_tbl (struct iris_inst *inst,u32 plane, +const u32 **buf_tbl,u32 *buf_tbl_size) {const struct iris_platform_data *platform_data = inst->core->iris_platform_data; -const u32 *internal_buf_type; -u32 internal_buffer_count, i;if (inst->domain ==DECODER ) {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; -for (i =0 ; i < internal_buffer_count; i++) -iris_fill_internal_buf_info (inst, internal_buf_type[i]); + *buf_tbl = platform_data->dec_ip_int_buf_tbl; + *buf_tbl_size = platform_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; -for (i =0 ; i < internal_buffer_count; i++) -iris_fill_internal_buf_info (inst, internal_buf_type[i]); + *buf_tbl = platform_data->dec_op_int_buf_tbl; + *buf_tbl_size = platform_data->dec_op_int_buf_tbl_size; } }else {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; -for (i =0 ; i < internal_buffer_count; i++) -iris_fill_internal_buf_info (inst, internal_buf_type[i]); + *buf_tbl = platform_data->enc_ip_int_buf_tbl; + *buf_tbl_size = platform_data->enc_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; -for (i =0 ; i < internal_buffer_count; i++) -iris_fill_internal_buf_info (inst, internal_buf_type[i]); + *buf_tbl = platform_data->enc_op_int_buf_tbl; + *buf_tbl_size = platform_data->enc_op_int_buf_tbl_size; } } } +void iris_get_internal_buffers (struct iris_inst *inst,u32 plane) +{ +const u32 *internal_buf_type; +u32 internal_buffer_count, i; + +iris_get_int_buf_tbl (inst, plane, &internal_buf_type, &internal_buffer_count); + +for (i =0 ; i < internal_buffer_count; i++) +iris_fill_internal_buf_info (inst, internal_buf_type[i]); +} +static int iris_create_internal_buffer (struct iris_inst *inst,enum iris_buffer_type buffer_type,u32 index) {
@@ -366,29 +368,12 @@ static int iris_create_internal_buffer(struct iris_inst *inst,int iris_create_internal_buffers (struct iris_inst *inst,u32 plane) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data;u32 internal_buffer_count, i, j;struct iris_buffers *buffers;const u32 *internal_buf_type;int ret; -if (inst->domain ==DECODER ) { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; - } - }else { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; - } - } +iris_get_int_buf_tbl (inst, plane, &internal_buf_type, &internal_buffer_count);for (i =0 ; i < internal_buffer_count; i++) { buffers = &inst->buffers[internal_buf_type[i]];
@@ -442,30 +427,13 @@ int iris_queue_internal_deferred_buffers(struct iris_inst *inst, enum iris_buffeint iris_queue_internal_buffers (struct iris_inst *inst,u32 plane) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data;struct iris_buffer *buffer, *next;struct iris_buffers *buffers;const u32 *internal_buf_type;u32 internal_buffer_count, i;int ret; -if (inst->domain ==DECODER ) { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; - } - }else { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; - } - } +iris_get_int_buf_tbl (inst, plane, &internal_buf_type, &internal_buffer_count);for (i =0 ; i < internal_buffer_count; i++) { buffers = &inst->buffers[internal_buf_type[i]];
@@ -501,30 +469,13 @@ int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *bufstatic int iris_destroy_internal_buffers (struct iris_inst *inst,u32 plane,bool force) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data;struct iris_buffer *buf, *next;struct iris_buffers *buffers;const u32 *internal_buf_type;u32 i, len;int ret; -if (inst->domain ==DECODER ) { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - len = platform_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - len = platform_data->dec_op_int_buf_tbl_size; - } - }else { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - len = platform_data->enc_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - len = platform_data->enc_op_int_buf_tbl_size; - } - } +iris_get_int_buf_tbl (inst, plane, &internal_buf_type, &len);for (i =0 ; i < len; i++) { buffers = &inst->buffers[internal_buf_type[i]];
@@ -593,18 +544,12 @@ static int iris_release_internal_buffers(struct iris_inst *inst,static int iris_release_input_internal_buffers (struct iris_inst *inst) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data;const u32 *internal_buf_type;u32 internal_buffer_count, i;int ret; -if (inst->domain ==DECODER ) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; - } +iris_get_int_buf_tbl (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE , + &internal_buf_type, &internal_buffer_count);for (i =0 ; i < internal_buffer_count; i++) { ret =iris_release_internal_buffers (inst, internal_buf_type[i]);
Signature · 1 line
2.34.1
Bryan O'Donoghue
maintainerRe: [PATCH 1/7] media: qcom: iris: Centralize internal buffer table selection
Quoted 6 lines · Dikshita Agarwal
drivers/media/platform/qcom/iris/iris_buffer.c +4
-0+static void iris_get_int_buf_tbl (struct iris_inst *inst,u32 plane, +const u32 **buf_tbl,u32 *buf_tbl_size) + *buf_tbl = platform_data->enc_op_int_buf_tbl; + *buf_tbl_size = platform_data->enc_op_int_buf_tbl_size;
drivers/media/platform/qcom/iris/iris_buffer.c static void iris_fill_internal_buf_info(struct iris_inst *inst, · line 331
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_buffer.c +6
-0} } } +void iris_get_internal_buffers (struct iris_inst *inst,u32 plane) +{ +const u32 *internal_buf_type; +u32 internal_buffer_count, i; + +iris_get_int_buf_tbl (inst, plane, &internal_buf_type, &internal_buffer_count);
I'd suggest mirroring the variable names from caller to callee since it makes reading/understanding the code generally easier.
---
bod
Dikshita Agarwal
maintainerPATCH 2/7 media: qcom: iris: fix state-change debug log printing stale value
In reply to Dikshita AgarwalThe state‑change debug log in iris_inst_change_state() always prints the same value for the old and new state, rendering it useless for debugging. This happens because the state is updated before the log is emitted.
Log the transition before updating the state so the previous value is preserved, consistent with the existing sub‑state handling.
--- drivers/media/platform/qcom/iris/iris_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_state.c +1 -1
@@ -60,9 +60,9 @@ int iris_inst_change_state(struct iris_inst *inst,return -EINVAL ; change_state: - inst->state = request_state;dev_dbg (inst->core->dev,"state changed from %x to %x\n" , inst->state, request_state); + inst->state = request_state;return 0 ; }
Signature · 1 line
2.34.1
Re: [PATCH 2/7] media: qcom: iris: fix state-change debug log printing stale value
Quoted 11 lines · Dikshita Agarwal
The state‑change debug log in
iris_inst_change_state()always prints the same value for the old and new state, rendering it useless for debugging. This happens because the state is updated before the log is emitted.Log the transition before updating the state so the previous value is preserved, consistent with the existing sub‑state handling.
Fixes 11712ce70f8e ("media: iris: implement vb2 streaming ops")Signed-off-by Dikshita Agarwal <[email protected]>---
I'd argue it prints the opposite of stale, but the fix is good!
Konrad
Re: [PATCH 2/7] media: qcom: iris: fix state-change debug log printing stale value
In reply to Dikshita AgarwalQuoted 31 lines · Dikshita Agarwal
The state‑change debug log in
iris_inst_change_state()always prints the same value for the old and new state, rendering it useless for debugging. This happens because the state is updated before the log is emitted.Log the transition before updating the state so the previous value is preserved, consistent with the existing sub‑state handling.
Fixes 11712ce70f8e ("media: iris: implement vb2 streaming ops")Signed-off-by Dikshita Agarwal <[email protected]>--- drivers/media/platform/qcom/iris/iris_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/qcom/iris/iris_state.c +1
-2@@ -60,9 +60,9 @@ int iris_inst_change_state(struct iris_inst *inst,return -EINVAL ; change_state: - inst->state = request_state;dev_dbg (inst->core->dev,"state changed from %x to %x\n" , inst->state, request_state); + inst->state = request_state;return 0 ; } --
Quoted 2 lines
2.34.1
Dikshita Agarwal
maintainerPATCH 3/7 media: qcom: iris: Fix bitmask test in iris_allow_cmd()
In reply to Dikshita Agarwaliris_allow_cmd() incorrectly tests a single sub‑state bit using a scalar comparison. Since sub_state is a bitmask, this allows STOP to pass when IRIS_INST_SUB_DRAIN is set alongside other bits, violating the intended drain semantics. Fix this by using a proper bitmask test.
--- drivers/media/platform/qcom/iris/iris_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_state.c +1 -1
@@ -269,7 +269,7 @@ bool iris_allow_cmd(struct iris_inst *inst, u32 cmd)return true; }else if (cmd ==V4L2_DEC_CMD_STOP || cmd ==V4L2_ENC_CMD_STOP ) {if (vb2_is_streaming (src_q)) -if (inst->sub_state !=IRIS_INST_SUB_DRAIN ) +if (!(inst->sub_state &IRIS_INST_SUB_DRAIN ))return true; }
Signature · 1 line
2.34.1
Re: [PATCH 3/7] media: qcom: iris: Fix bitmask test in iris_allow_cmd()
Quoted 2 lines · Dikshita Agarwal
iris_allow_cmd()incorrectly tests a single sub‑state bit using a scalar comparison
I don't think scalar is the right term here. You're changing logical comparison to bit-wise comparison.
Otherwise
---
bod
Dikshita Agarwal
maintainerPATCH 4/7 media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
In reply to Dikshita AgarwalFold the ternary initialiser directly into the variable declaration, removing the dead store that was immediately overwritten.
--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +2 -3
@@ -536,10 +536,9 @@ static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) {u32 port =iris_hfi_gen2_get_port (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );struct iris_inst_hfi_gen2 *inst_hfi_gen2 =to_iris_inst_hfi_gen2 (inst); -u32 tier = inst->fw_caps[TIER ].value; - - tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : +u32 tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : inst->fw_caps[TIER ].value; + inst_hfi_gen2->src_subcr_params.tier = tier; return iris_hfi_gen2_session_set_property(inst,
Signature · 1 line
2.34.1
Re: [PATCH 4/7] media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
Quoted 14 lines · Dikshita Agarwal
Fold the ternary initialiser directly into the variable declaration, removing the dead store that was immediately overwritten.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Signed-off-by Dikshita Agarwal <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +0
-0
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) · line 541
Quoted 9 lines
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +2
-3@@ -536,10 +536,9 @@ static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) {u32 port =iris_hfi_gen2_get_port (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );struct iris_inst_hfi_gen2 *inst_hfi_gen2 =to_iris_inst_hfi_gen2 (inst); -u32 tier = inst->fw_caps[TIER ].value; - - tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : +u32 tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : inst->fw_caps[TIER ].value; +
Since you're touching this already, I think the cleanest way to handle it would be to do 'tier_cap = (inst->codec == V4L2_PIX_FMT_AV1) ? TIER_AV1 : TIER` and then use that index
Also, the namespacing here is mediocre - "TIER" doesn't indicate it's an index of the fw caps array
Konrad
Dikshita Agarwal
maintainerRe: [PATCH 4/7] media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
Quoted 20 lines · Konrad Dybcio
Quoted 19 lines · Dikshita Agarwal
Fold the ternary initialiser directly into the variable declaration, removing the dead store that was immediately overwritten.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Signed-off-by Dikshita Agarwal <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +0
-2@@ -536,10 +536,9 @@ static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) {u32 port =iris_hfi_gen2_get_port (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );struct iris_inst_hfi_gen2 *inst_hfi_gen2 =to_iris_inst_hfi_gen2 (inst); -u32 tier = inst->fw_caps[TIER ].value; -
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) · line 541
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +2
-1- tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : +u32 tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : inst->fw_caps[TIER ].value; +Since you're touching this already, I think the cleanest way to handle it would be to do '
tier_cap= (inst->codec==V4L2_PIX_FMT_AV1) ?TIER_AV1: TIER` and then use that index
Ack.
Quoted 3 lines
Also, the namespacing here is mediocre - "TIER" doesn't indicate it's an index of the fw caps array
For now, I’d prefer to keep the existing TIER / TIER_AV1 naming, as many other fw caps follow the same pattern and renaming them would cause unrelated churn. Happy to revisit naming consistency as a separate cleanup.
Thanks,
Dikshita
Quoted 2 lines
Konrad
Bryan O'Donoghue
maintainerRe: [PATCH 4/7] media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
In reply to Dikshita AgarwalQuoted 28 lines · Dikshita Agarwal
Fold the ternary initialiser directly into the variable declaration, removing the dead store that was immediately overwritten.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Signed-off-by Dikshita Agarwal <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +2
-4@@ -536,10 +536,9 @@ static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) {u32 port =iris_hfi_gen2_get_port (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );struct iris_inst_hfi_gen2 *inst_hfi_gen2 =to_iris_inst_hfi_gen2 (inst); -u32 tier = inst->fw_caps[TIER ].value; - - tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : +u32 tier = (inst->codec ==V4L2_PIX_FMT_AV1 ) ? inst->fw_caps[TIER_AV1 ].value : inst->fw_caps[TIER ].value; + inst_hfi_gen2->src_subcr_params.tier = tier; return iris_hfi_gen2_session_set_property(inst, --
Quoted 2 lines
2.34.1
I don't get it.
What's the bug ?
---
bod
Dikshita Agarwal
maintainerRe: [PATCH 4/7] media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
Quoted 36 lines · Bryan O'Donoghue
Quoted 35 lines · Dikshita Agarwal
Fold the ternary initialiser directly into the variable declaration, removing the dead store that was immediately overwritten.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platformcapabilities and properties")
Signed-off-by Dikshita Agarwal <[email protected]>---
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c| 5 ++---1 file changed, 2 insertions(+), 3 deletions(-)drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +0
-0index
30bfd90d423ba024caf6ececc827f7102e8f3324..06698fde639ec654ff9ec78a178271ab2284f5f0100644drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +0
-0@@ -536,10 +536,9 @@ static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane) { u32 port = iris_hfi_gen2_get_port(inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );struct
iris_inst_hfi_gen2*inst_hfi_gen2=to_iris_inst_hfi_gen2(inst);
- u32 tier = inst->fw_caps[TIER].value;
-
- tier = (inst->codec==V4L2_PIX_FMT_AV1) ? inst->fw_caps[TIER_AV1].value :
+ u32 tier = (inst->codec==V4L2_PIX_FMT_AV1) ? inst->fw_caps[TIER_AV1].value :
inst->fw_caps[TIER].value; +
inst_hfi_gen2->src_subcr_params.tier= tier;return iris_hfi_gen2_session_set_property(inst,
Quoted 7 lines
Quoted 3 lines
Signature · 1 line
2.34.1I don't get it.
What's the bug ?
It's not a bug, just removing the dead assignment. Will remove fixes tag.
Thanks,
Dikshita
Quoted 3 lines
---
bod
Dikshita Agarwal
maintainerPATCH 5/7 media: qcom: iris: Remove duplicate HFI_PROP_OPB_ENABLE entry
In reply to Dikshita AgarwalHFI_PROP_OPB_ENABLE/iris_hfi_gen2_set_opb_enable appeared twice in the dispatch table, causing the property to be sent to firmware twice on every config-params call.
--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +0 -1
@@ -623,7 +623,6 @@ static int iris_hfi_gen2_session_set_config_params(struct iris_inst *inst, u32 p {HFI_PROP_FRAME_RATE, iris_hfi_gen2_set_frame_rate }, {HFI_PROP_AV1_FILM_GRAIN_PRESENT, iris_hfi_gen2_set_film_grain }, {HFI_PROP_AV1_SUPER_BLOCK_ENABLED, iris_hfi_gen2_set_super_block }, - {HFI_PROP_OPB_ENABLE, iris_hfi_gen2_set_opb_enable }, };if (inst->domain ==DECODER ) {
Signature · 1 line
2.34.1
Re: [PATCH 5/7] media: qcom: iris: Remove duplicate HFI_PROP_OPB_ENABLE entry
Quoted 7 lines · Dikshita Agarwal
HFI_PROP_OPB_ENABLE/iris_hfi_gen2_set_opb_enable appeared twice in the dispatch table, causing the property to be sent to firmware twice on every config-params call.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Signed-off-by Dikshita Agarwal <[email protected]>---
Konrad
Dikshita Agarwal
maintainerPATCH 6/7 media: qcom: iris: Add missing break in iris_hfi_gen2_session_set_codec()
In reply to Dikshita AgarwalWithout the break the AV1 case falls through, risking unintended behaviour if new cases are added after it.
--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +1 -0
@@ -696,6 +696,7 @@ static int iris_hfi_gen2_session_set_codec(struct iris_inst *inst)break ;case V4L2_PIX_FMT_AV1 : codec =HFI_CODEC_DECODE_AV1 ; +break ; } iris_hfi_gen2_packet_session_property(inst,
Signature · 1 line
2.34.1
Re: [PATCH 6/7] media: qcom: iris: Add missing break in iris_hfi_gen2_session_set_codec()
Quoted 6 lines · Dikshita Agarwal
Without the break the AV1 case falls through, risking unintended behaviour if new cases are added after it.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Signed-off-by Dikshita Agarwal <[email protected]>---
'fixes' is debatable here but anyway
Konrad
Re: [PATCH 6/7] media: qcom: iris: Add missing break in iris_hfi_gen2_session_set_codec()
In reply to Dikshita AgarwalQuoted 23 lines · Dikshita Agarwal
Without the break the AV1 case falls through, risking unintended behaviour if new cases are added after it.
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Signed-off-by Dikshita Agarwal <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 1 + 1 file changed, 1 insertion(+)drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +1
-1@@ -696,6 +696,7 @@ static int iris_hfi_gen2_session_set_codec(struct iris_inst *inst)break ;case V4L2_PIX_FMT_AV1 : codec =HFI_CODEC_DECODE_AV1 ; +break ; } iris_hfi_gen2_packet_session_property(inst, --
Quoted 2 lines
2.34.1
I don't think this is really a bug.
---
bod
Dikshita Agarwal
maintainerPATCH 7/7 media: qcom: iris: Make iris_destroy_internal_buffer() return void
In reply to Dikshita Agarwaliris_destroy_internal_buffer() is guaranteed to succeed and never reports an error. Returning an int is misleading and forces callers to handle a meaningless status value. Convert it to return void to match its behavior and simplify callers.
--- drivers/media/platform/qcom/iris/iris_buffer.c | 16 ++++------------ drivers/media/platform/qcom/iris/iris_buffer.h | 2 +- drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../media/platform/qcom/iris/iris_hfi_gen2_response.c | 4 +++- 4 files changed, 9 insertions(+), 15 deletions(-)
drivers/media/platform/qcom/iris/iris_buffer.c +4 -12
@@ -455,7 +455,7 @@ int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane)return 0 ; } -int iris_destroy_internal_buffer (struct iris_inst *inst,struct iris_buffer *buffer) +void iris_destroy_internal_buffer (struct iris_inst *inst,struct iris_buffer *buffer) {struct iris_core *core = inst->core;
@@ -463,8 +463,6 @@ int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *bufdma_free_attrs (core->dev, buffer->buffer_size, buffer->kvaddr, buffer->device_addr, buffer->dma_attrs);kfree (buffer); - -return 0 ; }static int iris_destroy_internal_buffers (struct iris_inst *inst,u32 plane,bool force)
@@ -473,7 +471,6 @@ static int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, boolstruct iris_buffers *buffers;const u32 *internal_buf_type;u32 i, len; -int ret;iris_get_int_buf_tbl (inst, plane, &internal_buf_type, &len);
@@ -488,9 +485,7 @@ static int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, boolif (!force && buf->attr &BUF_ATTR_QUEUED )continue ; - ret =iris_destroy_internal_buffer (inst, buf); -if (ret) -return ret; +iris_destroy_internal_buffer (inst, buf); } }
@@ -500,11 +495,8 @@ static int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, boolelse buffers = &inst->buffers[BUF_ARP ]; -list_for_each_entry_safe (buf, next, &buffers->list, list) { - ret =iris_destroy_internal_buffer (inst, buf); -if (ret) -return ret; - } +list_for_each_entry_safe (buf, next, &buffers->list, list) +iris_destroy_internal_buffer (inst, buf); }return 0 ;
drivers/media/platform/qcom/iris/iris_buffer.h +1 -1
@@ -112,7 +112,7 @@ void iris_get_internal_buffers(struct iris_inst *inst, u32 plane);int iris_create_internal_buffers (struct iris_inst *inst,u32 plane);int iris_queue_internal_buffers (struct iris_inst *inst,u32 plane);int iris_queue_internal_deferred_buffers (struct iris_inst *inst,enum iris_buffer_type buffer_type); -int iris_destroy_internal_buffer (struct iris_inst *inst,struct iris_buffer *buffer); +void iris_destroy_internal_buffer (struct iris_inst *inst,struct iris_buffer *buffer);int iris_destroy_all_internal_buffers (struct iris_inst *inst,u32 plane);int iris_destroy_dequeued_internal_buffers (struct iris_inst *inst,u32 plane);int iris_alloc_and_queue_persist_bufs (struct iris_inst *inst,enum iris_buffer_type buf_type);
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +1 -1
@@ -442,7 +442,7 @@ static int iris_hfi_gen1_session_unset_buffers(struct iris_inst *inst, struct ir ret =iris_wait_for_session_response (inst, false);if (!ret) - ret =iris_destroy_internal_buffer (inst, buf); +iris_destroy_internal_buffer (inst, buf); exit:kfree (pkt);
drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c +3 -1
@@ -447,7 +447,9 @@ static int iris_hfi_gen2_handle_release_internal_buffer(struct iris_inst *inst, buf->attr &= ~BUF_ATTR_QUEUED ; -return iris_destroy_internal_buffer (inst, buf); +iris_destroy_internal_buffer (inst, buf); + +return 0 ; } static int iris_hfi_gen2_handle_session_stop(struct iris_inst *inst,
Signature · 1 line
2.34.1
Re: [PATCH 7/7] media: qcom: iris: Make iris_destroy_internal_buffer() return void
Quoted 7 lines · Dikshita Agarwal
iris_destroy_internal_buffer()is guaranteed to succeed and never reports an error. Returning an int is misleading and forces callers to handle a meaningless status value. Convert it to return void to match its behavior and simplify callers.Signed-off-by Dikshita Agarwal <[email protected]>---
Konrad
Re: [PATCH 7/7] media: qcom: iris: Make iris_destroy_internal_buffer() return void
In reply to Dikshita AgarwalQuoted 7 lines · Dikshita Agarwal
iris_destroy_internal_buffer()is guaranteed to succeed and never reports an error. Returning an int is misleading and forces callers to handle a meaningless status value. Convert it to return void to match its behavior and simplify callers.Signed-off-by Dikshita Agarwal <[email protected]>---
iris_destroy_internal_buffers() can be made void too, now
Konrad
Re: [PATCH 7/7] media: qcom: iris: Make iris_destroy_internal_buffer() return void
In reply to Dikshita AgarwalQuoted 7 lines · Dikshita Agarwal
iris_destroy_internal_buffer()is guaranteed to succeed and never reports an error. Returning an int is misleading and forces callers to handle a meaningless status value. Convert it to return void to match its behavior and simplify callers.Signed-off-by Dikshita Agarwal <[email protected]>---
---
bod