Please pull platform-qcom-iris-encoder-plus-dependent-fixes-for-6.18-v2
From: Bryan O'Donoghue <[email protected]>
The following changes since commit dcd2ca10faaf59fedcafffc6bbf41ba628a23cc4:
media: i2c: s5k6a3: Use V4L2 legacy sensor clock helper (2025-09-08 20:32:43 +0200)
are available in the Git repository at:
https://gitlab.freedesktop.org/linux-media/users/bodonoghue.git tags/platform-qcom-iris-encoder-plus-dependent-fixes-for-6.18-v2
for you to fetch changes up to 105d6bc8583498dee6b8c665143a8d8eef135610:
media: iris: add VPU33 specific encoding buffer calculation (2025-09-09 09:59:37 +0100)
----------------------------------------------------------------
This tag contains:
- A number of Fixes:
- An set of patches to enable the encoder which depend on the Fixes: in this PR to apply cleanly
- A power-sequencing update from Neil which also depends on code in this tag
- v2 missed inclusion of "Fix buffer count reporting.." from Dikshita - fixed in v2.
platform-qcom-iris-generic-fixes-updates-for-6.18-v2 should be merged first.
----------------------------------------------------------------
Dikshita Agarwal (26):
media: iris: Fix buffer count reporting in internal buffer check
media: iris: Report unreleased PERSIST buffers on session close
media: iris: Fix memory leak by freeing untracked persist buffer
media: iris: Fix port streaming handling
media: iris: Allow substate transition to load resources during output streaming
media: iris: Always destroy internal buffers on firmware release response
media: iris: Update vbuf flags before v4l2_m2m_buf_done
media: iris: Simplify session stop logic by relying on vb2 checks
media: iris: Allow stop on firmware only if start was issued.
media: iris: Send dummy buffer address for all codecs during drain
media: iris: Fix missing LAST flag handling during drain
media: iris: Fix format check for CAPTURE plane in try_fmt
media: iris: Add support for video encoder device
media: iris: Initialize and deinitialize encoder instance structure
media: iris: Add support for ENUM_FMT, S/G/TRY_FMT encoder
media: iris: Add support for ENUM_FRAMESIZES/FRAMEINTERVALS for encoder
media: iris: Add support for VIDIOC_QUERYCAP for encoder video device
media: iris: Add encoder support for V4L2 event subscription
media: iris: Add support for G/S_SELECTION for encoder video device
media: iris: Add support for G/S_PARM for encoder video device
media: iris: Add platform-specific capabilities for encoder video device
media: iris: Add V4L2 streaming support for encoder video device
media: iris: Set platform capabilities to firmware for encoder video device
media: iris: Allocate and queue internal buffers for encoder video device
media: iris: Add support for buffer management ioctls for encoder device
media: iris: Add support for drain sequence in encoder video device
Neil Armstrong (1):
media: iris: add VPU33 specific encoding buffer calculation
drivers/media/platform/qcom/iris/Makefile | 5 +- drivers/media/platform/qcom/iris/iris_buffer.c | 222 ++++- drivers/media/platform/qcom/iris/iris_buffer.h | 7 +- drivers/media/platform/qcom/iris/iris_common.c | 232 ++++++ drivers/media/platform/qcom/iris/iris_common.h | 18 + drivers/media/platform/qcom/iris/iris_core.h | 20 +- drivers/media/platform/qcom/iris/iris_ctrls.c | 675 ++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 15 + drivers/media/platform/qcom/iris/iris_hfi_common.h | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 482 ++++++++--- .../platform/qcom/iris/iris_hfi_gen1_defines.h | 112 ++- .../platform/qcom/iris/iris_hfi_gen1_response.c | 60 +- .../platform/qcom/iris/iris_hfi_gen2_command.c | 359 +++++--- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 44 +- .../platform/qcom/iris/iris_hfi_gen2_response.c | 46 +- drivers/media/platform/qcom/iris/iris_instance.h | 24 + .../platform/qcom/iris/iris_platform_common.h | 76 +- .../media/platform/qcom/iris/iris_platform_gen2.c | 526 +++++++++++- .../platform/qcom/iris/iris_platform_qcs8300.h | 352 +++++++- .../platform/qcom/iris/iris_platform_sm8250.c | 236 +++++- drivers/media/platform/qcom/iris/iris_probe.c | 33 +- drivers/media/platform/qcom/iris/iris_state.c | 9 +- drivers/media/platform/qcom/iris/iris_state.h | 1 + drivers/media/platform/qcom/iris/iris_utils.c | 36 + drivers/media/platform/qcom/iris/iris_utils.h | 2 + drivers/media/platform/qcom/iris/iris_vb2.c | 58 +- drivers/media/platform/qcom/iris/iris_vdec.c | 251 +----- drivers/media/platform/qcom/iris/iris_vdec.h | 13 +- drivers/media/platform/qcom/iris/iris_venc.c | 579 +++++++++++++ drivers/media/platform/qcom/iris/iris_venc.h | 27 + drivers/media/platform/qcom/iris/iris_vidc.c | 299 ++++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 922 ++++++++++++++++++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 24 +- 33 files changed, 5051 insertions(+), 716 deletions(-) create mode 100644 drivers/media/platform/qcom/iris/iris_common.c create mode 100644 drivers/media/platform/qcom/iris/iris_common.h create mode 100644 drivers/media/platform/qcom/iris/iris_venc.c create mode 100644 drivers/media/platform/qcom/iris/iris_venc.h
Quoted 25 lines · On 09/09/2025 11:42, [email protected] wrote:
From: Bryan O'Donoghue <[email protected]>
The following changes since commit
dcd2ca10faaf59fedcafffc6bbf41ba628a23cc4:media: i2c: s5k6a3: Use V4L2 legacy sensor clock helper (2025-09-08 20:32:43 +0200)
are available in the Git repository at:
https://gitlab.freedesktop.org/linux-media/users/bodonoghue.git tags/platform-qcom-iris-encoder-plus-dependent-fixes-for-6.18-v2
for you to fetch changes up to
105d6bc8583498dee6b8c665143a8d8eef135610:media: iris: add VPU33 specific encoding buffer calculation (2025-09-09 09:59:37 +0100)
----------------------------------------------------------------
This tag contains:- A number of Fixes:
- An set of patches to enable the encoder which depend on the Fixes: in this PR to apply cleanly
- A power-sequencing update from Neil which also depends on code in this tag
- v2 missed inclusion of "Fix buffer count reporting.." from Dikshita - fixed in v2.
Quoted 2 lines
platform-qcom-iris-generic-fixes-updates-for-6.18-v2 should be merged first.
This fails to compile since this patch is now merged:
https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
"media: iris: Add platform-specific capabilities for encoder video device" doesn't take support for SM8750 (added by that patch) into account.
I marked this PR as "Changes Requested".
Bryan, if the changes are trivial (I suspect that's likely to be the case), then just adjust the patch and post a new PR.
Regards,
Hans
Quoted 72 lines
----------------------------------------------------------------
Dikshita Agarwal (26):
media: iris: Fix buffer count reporting in internal buffer check
media: iris: Report unreleased PERSIST buffers on session close
media: iris: Fix memory leak by freeing untracked persist buffer
media: iris: Fix port streaming handling
media: iris: Allow substate transition to load resources during output streaming
media: iris: Always destroy internal buffers on firmware release response
media: iris: Update vbuf flags beforev4l2_m2m_buf_done
media: iris: Simplify session stop logic by relying on vb2 checks
media: iris: Allow stop on firmware only if start was issued.
media: iris: Send dummy buffer address for all codecs during drain
media: iris: Fix missing LAST flag handling during drain
media: iris: Fix format check for CAPTURE plane intry_fmt
media: iris: Add support for video encoder device
media: iris: Initialize and deinitialize encoder instance structure
media: iris: Add support forENUM_FMT, S/G/TRY_FMT encoder
media: iris: Add support for ENUM_FRAMESIZES/FRAMEINTERVALS for encoder
media: iris: Add support forVIDIOC_QUERYCAPfor encoder video device
media: iris: Add encoder support for V4L2 event subscription
media: iris: Add support for G/S_SELECTION for encoder video device
media: iris: Add support for G/S_PARM for encoder video device
media: iris: Add platform-specific capabilities for encoder video device
media: iris: Add V4L2 streaming support for encoder video device
media: iris: Set platform capabilities to firmware for encoder video device
media: iris: Allocate and queue internal buffers for encoder video device
media: iris: Add support for buffer management ioctls for encoder device
media: iris: Add support for drain sequence in encoder video deviceNeil Armstrong (1):
media: iris: add VPU33 specific encoding buffer calculationdrivers/media/platform/qcom/iris/Makefile | 5 +- drivers/media/platform/qcom/iris/iris_buffer.c | 222 ++++- drivers/media/platform/qcom/iris/iris_buffer.h | 7 +- drivers/media/platform/qcom/iris/iris_common.c | 232 ++++++ drivers/media/platform/qcom/iris/iris_common.h | 18 + drivers/media/platform/qcom/iris/iris_core.h | 20 +- drivers/media/platform/qcom/iris/iris_ctrls.c | 675 ++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 15 + drivers/media/platform/qcom/iris/iris_hfi_common.h | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 482 ++++++++--- .../platform/qcom/iris/iris_hfi_gen1_defines.h | 112 ++- .../platform/qcom/iris/iris_hfi_gen1_response.c | 60 +- .../platform/qcom/iris/iris_hfi_gen2_command.c | 359 +++++--- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 44 +- .../platform/qcom/iris/iris_hfi_gen2_response.c | 46 +- drivers/media/platform/qcom/iris/iris_instance.h | 24 + .../platform/qcom/iris/iris_platform_common.h | 76 +- .../media/platform/qcom/iris/iris_platform_gen2.c | 526 +++++++++++- .../platform/qcom/iris/iris_platform_qcs8300.h | 352 +++++++- .../platform/qcom/iris/iris_platform_sm8250.c | 236 +++++- drivers/media/platform/qcom/iris/iris_probe.c | 33 +- drivers/media/platform/qcom/iris/iris_state.c | 9 +- drivers/media/platform/qcom/iris/iris_state.h | 1 + drivers/media/platform/qcom/iris/iris_utils.c | 36 + drivers/media/platform/qcom/iris/iris_utils.h | 2 + drivers/media/platform/qcom/iris/iris_vb2.c | 58 +- drivers/media/platform/qcom/iris/iris_vdec.c | 251 +----- drivers/media/platform/qcom/iris/iris_vdec.h | 13 +- drivers/media/platform/qcom/iris/iris_venc.c | 579 +++++++++++++ drivers/media/platform/qcom/iris/iris_venc.h | 27 + drivers/media/platform/qcom/iris/iris_vidc.c | 299 ++++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 922 ++++++++++++++++++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 24 +- 33 files changed, 5051 insertions(+), 716 deletions(-) create mode 100644 drivers/media/platform/qcom/iris/iris_common.c create mode 100644 drivers/media/platform/qcom/iris/iris_common.h create mode 100644 drivers/media/platform/qcom/iris/iris_venc.c create mode 100644 drivers/media/platform/qcom/iris/iris_venc.h