media: qcom: iris: miscellaneous code-quality fixes
Subsystems (4)
v4 cover 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.
---
Changes in v4:
- Updated commit description for "Remove duplicate HFI_PROP_OPB_ENABLE entry" patch (Sashiko AI)
- Link to v3: https://lore.kernel.org/all/20260531-iris-code-improvement-v3-0-4c699c3dd719@oss.qualcomm.com
Changes in v3:
- Rebased and resolved merge conflicts (Bryan)
- Link to v2: https://lore.kernel.org/r/20260423-iris-code-improvement-v2-0-9e9cbf00f9c9@oss.qualcomm.com
Changes in v2:
- Updated variables names for iris_get_int_buf_tbl helper (Bryan)
- Removed un-necessary fixes tags (Bryan, Konrad)
- Addressed other comments (Bryan, Konrad)
- Link to v1: https://lore.kernel.org/r/20260422-iris-code-improvement-v1-0-8e150482212d@oss.qualcomm.com
To: Vikash Garodia <[email protected]>
To: Dikshita Agarwal <[email protected]>
To: Abhinav Kumar <[email protected]>
To: Bryan O'Donoghue <[email protected]>
To: Mauro Carvalho Chehab <[email protected]>
To: Hans Verkuil <[email protected]>
To: Stefan Schmidt <[email protected]>
To: Hans Verkuil <[email protected]>
To: Deepa Guthyappa Madivalara <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: Bryan O'Donoghue <[email protected]>
---
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: b72408a2fd20e8fb7ea462eeb4293f826585fe03
change-id: 20260721-iris-code-improvement-b412d103bd3c
Best regards,
Signature · 1 line
Vishnu Reddy <[email protected]>
PATCH v4 1/7 media: qcom: iris: Centralize internal buffer table selection
From: Dikshita Agarwal <[email protected]>
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
@@ -492,39 +492,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 **internal_buf_type,u32 *internal_buffer_count) {const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data; -const u32 *internal_buf_type; -u32 internal_buffer_count, i;if (inst->domain ==DECODER ) {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_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]); + *internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + *internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - internal_buffer_count = firmware_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]); + *internal_buf_type = firmware_data->dec_op_int_buf_tbl; + *internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; } }else {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_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]); + *internal_buf_type = firmware_data->enc_ip_int_buf_tbl; + *internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; }else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - internal_buffer_count = firmware_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]); + *internal_buf_type = firmware_data->enc_op_int_buf_tbl; + *internal_buffer_count = firmware_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) {
@@ -559,29 +561,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_firmware_data *firmware_data = inst->core->iris_firmware_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 = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; - } - }else { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - internal_buffer_count = firmware_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]];
@@ -635,30 +620,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_firmware_data *firmware_data = inst->core->iris_firmware_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 = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; - } - }else { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - internal_buffer_count = firmware_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]];
@@ -694,30 +662,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_firmware_data *firmware_data = inst->core->iris_firmware_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 = firmware_data->dec_ip_int_buf_tbl; - len = firmware_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->dec_op_int_buf_tbl; - len = firmware_data->dec_op_int_buf_tbl_size; - } - }else { -if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - len = firmware_data->enc_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->enc_op_int_buf_tbl; - len = firmware_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]];
@@ -788,18 +739,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_firmware_data *firmware_data = inst->core->iris_firmware_data;const u32 *internal_buf_type;u32 internal_buffer_count, i;int ret; -if (inst->domain ==DECODER ) { - internal_buf_type = firmware_data->dec_ip_int_buf_tbl; - internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; - }else { - internal_buf_type = firmware_data->enc_ip_int_buf_tbl; - internal_buffer_count = firmware_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
Re: [PATCH v4 1/7] media: qcom: iris: Centralize internal buffer table selection
Quoted 10 lines · Vishnu Reddy
From: Dikshita Agarwal <[email protected]>
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.
Quoted 7 lines
Reviewed-by Bryan O'Donoghue <[email protected]>Signed-off-by Dikshita Agarwal <[email protected]>Signed-off-by Vishnu Reddy <[email protected]>--- drivers/media/platform/qcom/iris/iris_buffer.c | 107 ++++++------------------- 1 file changed, 26 insertions(+), 81 deletions(-)
Quoted 1 line
Signature · 2 lines
With best wishes Dmitry
PATCH v4 2/7 media: qcom: iris: fix state-change debug log printing stale value
In reply to Vishnu ReddyFrom: Dikshita Agarwal <[email protected]>
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.
--- 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 v4 2/7] media: qcom: iris: fix state-change debug log printing stale value
Quoted 10 lines · Vishnu Reddy
From: Dikshita Agarwal <[email protected]>
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.
Quoted 9 lines
Fixes 11712ce70f8e ("media: iris: implement vb2 streaming ops")Reviewed-by Bryan O'Donoghue <[email protected]>Reviewed-by Konrad Dybcio <[email protected]>Signed-off-by Dikshita Agarwal <[email protected]>Signed-off-by Vishnu Reddy <[email protected]>--- drivers/media/platform/qcom/iris/iris_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v4 3/7 media: qcom: iris: Fix bitmask test in iris_allow_cmd()
In reply to Vishnu ReddyFrom: Dikshita Agarwal <[email protected]>
iris_allow_cmd() incorrectly checks a sub‑state flag using a logical equality 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 v4 3/7] media: qcom: iris: Fix bitmask test in iris_allow_cmd()
Quoted 7 lines · Vishnu Reddy
From: Dikshita Agarwal <[email protected]>
iris_allow_cmd()incorrectly checks a sub‑state flag using a logical equality comparison. Sincesub_stateis a bitmask, this allows STOP to pass whenIRIS_INST_SUB_DRAINis set alongside other bits, violating the intended drain semantics. Fix this by using a proper bitmask test.
Quoted 8 lines
Fixes d09100763bed ("media: iris: add support for drain sequence")Reviewed-by Bryan O'Donoghue <[email protected]>Signed-off-by Dikshita Agarwal <[email protected]>Signed-off-by Vishnu Reddy <[email protected]>--- drivers/media/platform/qcom/iris/iris_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v4 4/7 media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
In reply to Vishnu ReddyFrom: Dikshita Agarwal <[email protected]>
Fold 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
@@ -603,10 +603,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; +u32 tier_cap = (inst->codec ==V4L2_PIX_FMT_AV1 ) ?TIER_AV1 :TIER ; +u32 tier = inst->fw_caps[tier_cap].value; - 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 v4 4/7] media: qcom: iris: Remove dead assignment in iris_hfi_gen2_set_tier()
Quoted 5 lines · Vishnu Reddy
From: Dikshita Agarwal <[email protected]>
Fold the ternary initialiser directly into the variable declaration, removing the dead store that was immediately overwritten.
Quoted 7 lines
Reviewed-by Bryan O'Donoghue <[email protected]>Signed-off-by Dikshita Agarwal <[email protected]>Signed-off-by Vishnu Reddy <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v4 5/7 media: qcom: iris: Remove duplicate HFI_PROP_OPB_ENABLE entry
In reply to Vishnu ReddyFrom: Dikshita Agarwal <[email protected]>
HFI_PROP_OPB_ENABLE/iris_hfi_gen2_set_opb_enable appears twice in the dispatch table. Since the property lookup stops at the first matching entry, the second instance is never reached.
Remove the duplicate entry to eliminate the redundant entry from the dispatch table.
--- 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
@@ -691,7 +691,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 v4 5/7] media: qcom: iris: Remove duplicate HFI_PROP_OPB_ENABLE entry
Quoted 8 lines · Vishnu Reddy
From: Dikshita Agarwal <[email protected]>
HFI_PROP_OPB_ENABLE/iris_hfi_gen2_set_opb_enable appears twice in the dispatch table. Since the property lookup stops at the first matching entry, the second instance is never reached.
Remove the duplicate entry to eliminate the redundant entry from the dispatch table.
Quoted 8 lines
Fixes 2af481a459a4 ("media: iris: Define AV1-specific platform capabilities and properties")Reviewed-by Konrad Dybcio <[email protected]>Signed-off-by Dikshita Agarwal <[email protected]>Signed-off-by Vishnu Reddy <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 1 - 1 file changed, 1 deletion(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v4 6/7 media: qcom: iris: Add missing break in iris_hfi_gen2_session_set_codec()
In reply to Vishnu ReddyFrom: Dikshita Agarwal <[email protected]>
Without 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
@@ -764,6 +764,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 v4 6/7] media: qcom: iris: Add missing break in iris_hfi_gen2_session_set_codec()
Quoted 5 lines · Vishnu Reddy
From: Dikshita Agarwal <[email protected]>
Without the break the AV1 case falls through, risking unintended behaviour if new cases are added after it.
Quoted 8 lines
Reviewed-by Bryan O'Donoghue <[email protected]>Reviewed-by Konrad Dybcio <[email protected]>Signed-off-by Dikshita Agarwal <[email protected]>Signed-off-by Vishnu Reddy <[email protected]>--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 1 + 1 file changed, 1 insertion(+)
Signature · 2 lines
With best wishes Dmitry
PATCH v4 7/7 media: qcom: iris: Make iris_destroy_internal_buffer() return void
In reply to Vishnu ReddyFrom: Dikshita Agarwal <[email protected]>
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.
--- 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
@@ -648,7 +648,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;
@@ -656,8 +656,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)
@@ -666,7 +664,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);
@@ -681,9 +678,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); } }
@@ -693,11 +688,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