* [PATCH v2 0/7] media: iris: add support for kaanapali platform
@ 2026-02-27 14:11 Vikash Garodia
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
` (7 more replies)
0 siblings, 8 replies; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Qualcomm kaanapali platform have a newer generation of video IP iris4.
The hardware have evolved mostly with respect to higher number of power
domains as well as multiple clock sources.
Considering iris as a client driver, it adds the handling for multiple
stream ids from VPU via iommu-map.
This series is depend on the below series:
https://lore.kernel.org/all/20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com/
Following patches were dropped in v2, as per the comments, and would
be posted separately. This series depends on these patches for
functionality.
- https://lore.kernel.org/all/20260126-kaanapali-iris-v1-2-e2646246bfc1@oss.qualcomm.com/
- https://lore.kernel.org/all/20260126-kaanapali-iris-v1-3-e2646246bfc1@oss.qualcomm.com/
Patch #4 is also posted alongwith below series. If the other series is
picked earlier, then this patch can be dropped from this series.
https://lore.kernel.org/all/20260227-iris_sc7280_gen2_support-v2-1-7e5b13d26542@oss.qualcomm.com/
Following are the compliance and functional validation reports.
v4l2-compliance report for decoder including streaming tests:
v4l2-compliance 1.33.0-5441, 64 bits, 64-bit time_t
v4l2-compliance SHA: 4310f15610f4 2026-01-18 22:09:17
Compliance test for iris_driver device /dev/video0:
Driver Info:
Driver name : iris_driver
Card type : Iris Decoder
Bus info : platform:2000000.video-codec
Driver version : 6.19.0
Capabilities : 0x84204000
Video Memory-to-Memory Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar
Streaming
Extended Pix Format
Detected Stateful Decoder
Required ioctls:
test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK
Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 12 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK
test Composing: OK
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
test CREATE_BUFS maximum buffers: OK
test VIDIOC_REMOVE_BUFS: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
test blocking wait: OK
Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
the input file is smaller than 7077888 bytes
Video Capture Multiplanar: Captured 465 buffers
test MMAP (select, REQBUFS): OK
the input file is smaller than 7077888 bytes
Video Capture Multiplanar: Captured 465 buffers
test MMAP (epoll, REQBUFS): OK
the input file is smaller than 7077888 bytes
Video Capture Multiplanar: Captured 465 buffers
test MMAP (select, CREATE_BUFS): OK
the input file is smaller than 7077888 bytes
Video Capture Multiplanar: Captured 465 buffers
test MMAP (epoll, CREATE_BUFS): OK
test USERPTR (select): OK (Not Supported)
test DMABUF: Cannot test, specify --expbuf-device
Total for iris_driver device /dev/video0: 54, Succeeded: 54, Failed: 0,
Warnings: 0
v4l2-compliance report for encoder including streaming tests:
v4l2-compliance 1.33.0-5441, 64 bits, 64-bit time_t
v4l2-compliance SHA: 4310f15610f4 2026-01-18 22:09:17
Compliance test for iris_driver device /dev/video1:
Driver Info:
Driver name : iris_driver
Card type : Iris Encoder
Bus info : platform:2000000.video-codec
Driver version : 6.19.0
Capabilities : 0x84204000
Video Memory-to-Memory Multiplanar
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar
Streaming
Extended Pix Format
Detected Stateful Encoder
Required ioctls:
test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK
Allow for multiple opens:
test second /dev/video1 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 38 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
test VIDIOC_G/S_PARM: OK
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
test CREATE_BUFS maximum buffers: OK
test VIDIOC_REMOVE_BUFS: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
test blocking wait: OK
Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
Video Capture Multiplanar: Captured 61 buffers
test MMAP (select, REQBUFS): OK
Video Capture Multiplanar: Captured 61 buffers
test MMAP (epoll, REQBUFS): OK
Video Capture Multiplanar: Captured 61 buffers
test MMAP (select, CREATE_BUFS): OK
Video Capture Multiplanar: Captured 61 buffers
test MMAP (epoll, CREATE_BUFS): OK
test USERPTR (select): OK (Not Supported)
test DMABUF: Cannot test, specify --expbuf-device
Total for iris_driver device /dev/video1: 54, Succeeded: 54, Failed: 0,
Warnings: 0
Fluster test report:
77/135 while testing JVT-AVC_V1 with
GStreamer-H.264-V4L2-Gst1.0.JVT-AVC_V1
The failing tests are:
- 52 test vectors failed due to interlaced clips: Interlaced decoding is
not supported.
- cabac_mot_fld0_full
- cabac_mot_mbaff0_full
- cabac_mot_picaff0_full
- CABREF3_Sand_D
- CAFI1_SVA_C
- CAMA1_Sony_C
- CAMA1_TOSHIBA_B
- cama1_vtc_c
- cama2_vtc_b
- CAMA3_Sand_E
- cama3_vtc_b
- CAMACI3_Sony_C
- CAMANL1_TOSHIBA_B
- CAMANL2_TOSHIBA_B
- CAMANL3_Sand_E
- CAMASL3_Sony_B
- CAMP_MOT_MBAFF_L30
- CAMP_MOT_MBAFF_L31
- CANLMA2_Sony_C
- CANLMA3_Sony_C
- CAPA1_TOSHIBA_B
- CAPAMA3_Sand_F
- cavlc_mot_fld0_full_B
- cavlc_mot_mbaff0_full_B
- cavlc_mot_picaff0_full_B
- CVCANLMA2_Sony_C
- CVFI1_Sony_D
- CVFI1_SVA_C
- CVFI2_Sony_H
- CVFI2_SVA_C
- CVMA1_Sony_D
- CVMA1_TOSHIBA_B
- CVMANL1_TOSHIBA_B
- CVMANL2_TOSHIBA_B
- CVMAPAQP3_Sony_E
- CVMAQP2_Sony_G
- CVMAQP3_Sony_D
- CVMP_MOT_FLD_L30_B
- CVNLFI1_Sony_C
- CVNLFI2_Sony_H
- CVPA1_TOSHIBA_B
- FI1_Sony_E
- MR6_BT_B
- MR7_BT_B
- MR8_BT_B
- MR9_BT_B
- Sharp_MP_Field_1_B
- Sharp_MP_Field_2_B
- Sharp_MP_Field_3_B
- Sharp_MP_PAFF_1r2
- Sharp_MP_PAFF_2r
- CVMP_MOT_FRM_L31_B
3 test case failed due to unsupported bitstream.
num_slice_groups_minus1 greater than zero is not supported.
- FM1_BT_B
- FM1_FT_E
- FM2_SVA_C
2 test case failed because SP_SLICE type is not supported.
- SP1_BT_A
- sp2_bt_b
1 test case failed due to unsupported profile.
- BA3_SVA_C
131/147 testcases passed while testing JCT-VC-HEVC_V1 with
GStreamer-H.265-V4L2-Gst1.0
10 testcases failed due to unsupported 10 bit format.
- DBLK_A_MAIN10_VIXS_4
- INITQP_B_Main10_Sony_1
- TSUNEQBD_A_MAIN10_Technicolor_2
- WP_A_MAIN10_Toshiba_3
- WP_MAIN10_B_Toshiba_3
- WPP_A_ericsson_MAIN10_2
- WPP_B_ericsson_MAIN10_2
- WPP_C_ericsson_MAIN10_2
- WPP_E_ericsson_MAIN10_2
- WPP_F_ericsson_MAIN10_2
4 testcase failed due to unsupported resolution.
- PICSIZE_A_Bossen_1
- PICSIZE_B_Bossen_1
- WPP_D_ericsson_MAIN10_2
- WPP_D_ericsson_MAIN_2
2 testcase failed due to CRC mismatch.
- VPSSPSPPS_A_MainConcept_1
This fails with software decoder as well. Earlier discussion on this
here https://lore.kernel.org/all/63ca375440c4ff2f55ea0aa4e19458f775552d88.camel@ndufresne.ca/
- RAP_A_docomo_6
This was discussed on bug
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4392
Based on above discussion, the initial error frames need to be safely
dropped in the firmware or driver side. Client does not have the
required logic to drop them even if marked as error.
Discussion ongoing with video firmware team on a way to handle such
case. Note that the issue is not specific to kaanapali, and its there on
all platforms.
235/305 testcases passed while testing VP9-TEST-VECTORS with GStreamer-VP9-V4L2-Gst1.0
64 testcases failed due to unsupported resolution
- vp90-2-02-size-08x08.webm
- vp90-2-02-size-08x10.webm
- vp90-2-02-size-08x16.webm
- vp90-2-02-size-08x18.webm
- vp90-2-02-size-08x32.webm
- vp90-2-02-size-08x34.webm
- vp90-2-02-size-08x64.webm
- vp90-2-02-size-08x66.webm
- vp90-2-02-size-10x08.webm
- vp90-2-02-size-10x10.webm
- vp90-2-02-size-10x16.webm
- vp90-2-02-size-10x18.webm
- vp90-2-02-size-10x32.webm
- vp90-2-02-size-10x34.webm
- vp90-2-02-size-10x64.webm
- vp90-2-02-size-10x66.webm
- vp90-2-02-size-16x08.webm
- vp90-2-02-size-16x10.webm
- vp90-2-02-size-16x16.webm
- vp90-2-02-size-16x18.webm
- vp90-2-02-size-16x32.webm
- vp90-2-02-size-16x34.webm
- vp90-2-02-size-16x64.webm
- vp90-2-02-size-16x66.webm
- vp90-2-02-size-18x08.webm
- vp90-2-02-size-18x10.webm
- vp90-2-02-size-18x16.webm
- vp90-2-02-size-18x18.webm
- vp90-2-02-size-18x32.webm
- vp90-2-02-size-18x34.webm
- vp90-2-02-size-18x64.webm
- vp90-2-02-size-18x66.webm
- vp90-2-02-size-32x08.webm
- vp90-2-02-size-32x10.webm
- vp90-2-02-size-32x16.webm
- vp90-2-02-size-32x18.webm
- vp90-2-02-size-32x32.webm
- vp90-2-02-size-32x34.webm
- vp90-2-02-size-32x64.webm
- vp90-2-02-size-32x66.webm
- vp90-2-02-size-34x08.webm
- vp90-2-02-size-34x10.webm
- vp90-2-02-size-34x16.webm
- vp90-2-02-size-34x18.webm
- vp90-2-02-size-34x32.webm
- vp90-2-02-size-34x34.webm
- vp90-2-02-size-34x64.webm
- vp90-2-02-size-34x66.webm
- vp90-2-02-size-64x08.webm
- vp90-2-02-size-64x10.webm
- vp90-2-02-size-64x16.webm
- vp90-2-02-size-64x18.webm
- vp90-2-02-size-64x32.webm
- vp90-2-02-size-64x34.webm
- vp90-2-02-size-64x64.webm
- vp90-2-02-size-64x66.webm
- vp90-2-02-size-66x08.webm
- vp90-2-02-size-66x10.webm
- vp90-2-02-size-66x16.webm
- vp90-2-02-size-66x18.webm
- vp90-2-02-size-66x32.webm
- vp90-2-02-size-66x34.webm
- vp90-2-02-size-66x64.webm
- vp90-2-02-size-66x66.webm
2 testcases failed due to unsupported format.
- vp91-2-04-yuv422.webm
- vp91-2-04-yuv444.webm
2 testcase failed due to unsupported resolution after DRC.
- vp90-2-21-resize_inter_320x180_5_1-2.webm
- vp90-2-21-resize_inter_320x180_7_1-2.webm
1 testcase failed with CRC mismatch.
- vp90-2-22-svc_1280x720_3.ivf
Discussion ongoing with firmware team on how to handle this case. This
is not specific to kaanapali, and its there on all platforms.
1 testcase failed due to unsupported stream.
- vp90-2-16-intra-only.webm
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
Changes in v2:
- Described iommu map in a better way in binding (Dmitry, Krzysztof)
- Defined the function IDs as ABI instead of hardcode numbers (Dmitry)
- Added iris vpu bus and configured callback for dma_configure (Robin)
- Remove parsing of iommu-map from driver (Robin)
- Fixed fluster issues by adding H265 line buffer calculation for vpu4
- Dropped iommu patches #2 and #3 from this series. Those would be
posted separately (Bryan)
- Link to v1: https://lore.kernel.org/r/20260126-kaanapali-iris-v1-0-e2646246bfc1@oss.qualcomm.com
---
Vikash Garodia (7):
media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
media: iris: switch to hardware mode after firmware boot
media: iris: add iris vpu bus support and register it with iommu_buses
media: iris: add context bank devices using iommu-map
media: iris: add helper to select context bank device
media: iris: add iris4 specific H265 line buffer calculation
media: iris: add platform data for kaanapali
.../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
drivers/iommu/iommu.c | 4 +
drivers/media/platform/qcom/iris/Makefile | 4 +
drivers/media/platform/qcom/iris/iris_buffer.c | 7 +-
drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
drivers/media/platform/qcom/iris/iris_core.c | 4 +
drivers/media/platform/qcom/iris/iris_hfi_common.c | 4 +
drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +-
.../platform/qcom/iris/iris_platform_common.h | 19 ++
.../media/platform/qcom/iris/iris_platform_gen2.c | 90 +++++++
.../platform/qcom/iris/iris_platform_kaanapali.h | 86 +++++++
drivers/media/platform/qcom/iris/iris_probe.c | 64 ++++-
drivers/media/platform/qcom/iris/iris_resources.c | 96 ++++++++
drivers/media/platform/qcom/iris/iris_resources.h | 3 +
drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
drivers/media/platform/qcom/iris/iris_vpu2.c | 1 +
drivers/media/platform/qcom/iris/iris_vpu3x.c | 9 +-
drivers/media/platform/qcom/iris/iris_vpu4x.c | 24 +-
drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++-
drivers/media/platform/qcom/iris/iris_vpu_bus.c | 32 +++
drivers/media/platform/qcom/iris/iris_vpu_common.c | 16 +-
drivers/media/platform/qcom/iris/iris_vpu_common.h | 3 +
include/dt-bindings/media/qcom,iris.h | 18 ++
include/linux/iris_vpu_bus.h | 13 +
24 files changed, 791 insertions(+), 40 deletions(-)
---
base-commit: 7d6661873f6b54c75195780a40d66bad3d482d8f
change-id: 20260126-kaanapali-iris-29fd184e2fe4
prerequisite-message-id: <20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com>
prerequisite-patch-id: 421e3bb43ae0dbd6a1ba02acd02592d260456eb1
prerequisite-patch-id: f4b9b5e59b3d37407941f7fee05ca4996ad3d9ba
prerequisite-patch-id: 4556a2b44275b120be0faa86bde0b55593065476
Best regards,
--
Vikash Garodia <vikash.garodia@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 47+ messages in thread
* [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 15:42 ` Rob Herring (Arm)
` (2 more replies)
2026-02-27 14:11 ` [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot Vikash Garodia
` (6 subsequent siblings)
7 siblings, 3 replies; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Kaanapali SOC brings in the new generation of video IP i.e iris4. When
compared to previous generation, iris3x, it has,
- separate power domains for stream and pixel processing hardware blocks
(bse and vpp).
- additional power domain for apv codec.
- power domains for individual pipes (VPPx).
- different clocks and reset lines.
iommu-map include all the different stream-ids which can be possibly
generated by vpu4 hardware as below,
bitstream stream from vcodec
non-pixel stream from vcodec
non-pixel stream from tensilica
pixel stream from vcodec
secure bitstream stream from vcodec
secure non-pixel stream from vcodec
secure non-pixel stream from tensilica
secure pixel stream from vcodec
firmware stream from tensilica (might be handled by the TZ / hyp)
This patch is depend on the below dt-schema patch.
Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
.../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
include/dt-bindings/media/qcom,iris.h | 18 ++
2 files changed, 279 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml b/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..db734c664a0417d8f5ea55b066f63f42583b1c14
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml
@@ -0,0 +1,261 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/qcom,kaanapali-iris.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Kaanapali Iris video encoder and decoder
+
+maintainers:
+ - Vikash Garodia <vikash.garodia@oss.qualcomm.com>
+ - Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
+
+description:
+ The iris video processing unit is a video encode and decode accelerator
+ present on Qualcomm Kaanapali SoC.
+
+definitions:
+ iommu-types:
+ items:
+ - description: Function ID
+ - description: Phandle to IOMMU
+ - description: IOMMU stream ID base
+ - description: IOMMU stream ID mask
+ - description: Number of stream IDs
+
+properties:
+ compatible:
+ const: qcom,kaanapali-iris
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 10
+
+ clock-names:
+ items:
+ - const: iface
+ - const: core
+ - const: vcodec0_core
+ - const: iface1
+ - const: core_freerun
+ - const: vcodec0_core_freerun
+ - const: vcodec_bse
+ - const: vcodec_vpp0
+ - const: vcodec_vpp1
+ - const: vcodec_apv
+
+ dma-coherent: true
+
+ firmware-name:
+ maxItems: 1
+
+ interconnects:
+ maxItems: 2
+
+ interconnect-names:
+ items:
+ - const: cpu-cfg
+ - const: video-mem
+
+ interrupts:
+ maxItems: 1
+
+ iommu-map:
+ description: |
+ - bitstream stream from vcodec
+ - non-pixel stream from vcodec
+ - non-pixel stream from tensilica
+ - pixel stream from vcodec
+ - secure bitstream stream from vcodec
+ - secure non-pixel stream from vcodec
+ - secure non-pixel stream from tensilica
+ - secure pixel stream from vcodec
+ # firmware might be handled by the TZ / hyp
+ - firmware stream from tensilica
+ $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ items:
+ $ref: '#/definitions/iommu-types'
+ minItems: 5
+ minItems: 8
+ maxItems: 9
+
+ memory-region:
+ maxItems: 1
+
+ operating-points-v2: true
+ opp-table:
+ type: object
+
+ power-domains:
+ maxItems: 7
+
+ power-domain-names:
+ items:
+ - const: venus
+ - const: vcodec0
+ - const: mxc
+ - const: mmcx
+ - const: vpp0
+ - const: vpp1
+ - const: apv
+
+ resets:
+ maxItems: 4
+
+ reset-names:
+ items:
+ - const: bus0
+ - const: bus1
+ - const: core
+ - const: vcodec0_core
+
+required:
+ - compatible
+ - reg
+ - clocks
+ - clock-names
+ - dma-coherent
+ - interconnects
+ - interconnect-names
+ - interrupts
+ - iommu-map
+ - memory-region
+ - power-domains
+ - power-domain-names
+ - resets
+ - reset-names
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/media/qcom,iris.h>
+ #include <dt-bindings/power/qcom,rpmhpd.h>
+
+ video-codec@2000000 {
+ compatible = "qcom,kaanapali-iris";
+ reg = <0x02000000 0xf0000>;
+
+ clocks = <&gcc_video_axi0_clk>,
+ <&video_cc_mvs0c_clk>,
+ <&video_cc_mvs0_clk>,
+ <&gcc_video_axi1_clk>,
+ <&video_cc_mvs0c_freerun_clk>,
+ <&video_cc_mvs0_freerun_clk>,
+ <&video_cc_mvs0b_clk>,
+ <&video_cc_mvs0_vpp0_clk>,
+ <&video_cc_mvs0_vpp1_clk>,
+ <&video_cc_mvs0a_clk>;
+ clock-names = "iface",
+ "core",
+ "vcodec0_core",
+ "iface1",
+ "core_freerun",
+ "vcodec0_core_freerun",
+ "vcodec_bse",
+ "vcodec_vpp0",
+ "vcodec_vpp1",
+ "vcodec_apv";
+
+ dma-coherent;
+
+ interconnects = <&gem_noc_master_appss_proc &config_noc_slave_venus_cfg>,
+ <&mmss_noc_master_video_mvp &mc_virt_slave_ebi1>;
+ interconnect-names = "cpu-cfg",
+ "video-mem";
+
+ interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+
+ iommu-map = <IRIS_BITSTREAM &apps_smmu 0x1944 0x0 0x1>,
+ <IRIS_NON_PIXEL &apps_smmu 0x1940 0x0 0x1>,
+ <IRIS_NON_PIXEL &apps_smmu 0x1a20 0x0 0x1>,
+ <IRIS_PIXEL &apps_smmu 0x1943 0x0 0x1>,
+ <IRIS_SECURE_BITSTREAM &apps_smmu 0x1946 0x0 0x1>,
+ <IRIS_SECURE_NON_PIXEL &apps_smmu 0x1941 0x0 0x1>,
+ <IRIS_SECURE_NON_PIXEL &apps_smmu 0x1a21 0x0 0x1>,
+ <IRIS_SECURE_PIXEL &apps_smmu 0x1945 0x0 0x1>,
+ <IRIS_FIRMWARE &apps_smmu 0x1a22 0x0 0x1>;
+
+ memory-region = <&video_mem>;
+
+ operating-points-v2 = <&iris_opp_table>;
+
+ power-domains = <&video_cc_mvs0c_gdsc>,
+ <&video_cc_mvs0_gdsc>,
+ <&rpmhpd RPMHPD_MXC>,
+ <&rpmhpd RPMHPD_MMCX>,
+ <&video_cc_mvs0_vpp0_gdsc>,
+ <&video_cc_mvs0_vpp1_gdsc>,
+ <&video_cc_mvs0a_gdsc>;
+ power-domain-names = "venus",
+ "vcodec0",
+ "mxc",
+ "mmcx",
+ "vpp0",
+ "vpp1",
+ "apv";
+
+ resets = <&gcc_video_axi0_clk_ares>,
+ <&gcc_video_axi1_clk_ares>,
+ <&video_cc_mvs0c_freerun_clk_ares>,
+ <&video_cc_mvs0_freerun_clk_ares>;
+ reset-names = "bus0",
+ "bus1",
+ "core",
+ "vcodec0_core";
+
+ iris_opp_table: opp-table {
+ compatible = "operating-points-v2";
+
+ opp-240000000 {
+ opp-hz = /bits/ 64 <240000000 240000000 240000000 360000000>;
+ required-opps = <&rpmhpd_opp_low_svs_d1>,
+ <&rpmhpd_opp_low_svs_d1>;
+ };
+
+ opp-338000000 {
+ opp-hz = /bits/ 64 <338000000 338000000 338000000 507000000>;
+ required-opps = <&rpmhpd_opp_low_svs>,
+ <&rpmhpd_opp_low_svs>;
+ };
+
+ opp-420000000 {
+ opp-hz = /bits/ 64 <420000000 420000000 420000000 630000000>;
+ required-opps = <&rpmhpd_opp_svs>,
+ <&rpmhpd_opp_svs>;
+ };
+
+ opp-444000000 {
+ opp-hz = /bits/ 64 <444000000 444000000 444000000 666000000>;
+ required-opps = <&rpmhpd_opp_svs_l1>,
+ <&rpmhpd_opp_svs_l1>;
+ };
+
+ opp-533000000 {
+ opp-hz = /bits/ 64 <533000000 533000000 533000000 800000000>;
+ required-opps = <&rpmhpd_opp_nom>,
+ <&rpmhpd_opp_nom>;
+ };
+
+ opp-630000000 {
+ opp-hz = /bits/ 64 <630000000 630000000 630000000 1104000000>;
+ required-opps = <&rpmhpd_opp_turbo>,
+ <&rpmhpd_opp_turbo>;
+ };
+
+ opp-800000000 {
+ opp-hz = /bits/ 64 <800000000 630000000 630000000 1260000000>;
+ required-opps = <&rpmhpd_opp_turbo_l0>,
+ <&rpmhpd_opp_turbo_l0>;
+ };
+
+ opp-1000000000 {
+ opp-hz = /bits/ 64 <1000000000 630000000 850000000 1260000000>;
+ required-opps = <&rpmhpd_opp_turbo_l1>,
+ <&rpmhpd_opp_turbo_l1>;
+ };
+ };
+ };
diff --git a/include/dt-bindings/media/qcom,iris.h b/include/dt-bindings/media/qcom,iris.h
new file mode 100644
index 0000000000000000000000000000000000000000..beb244289466ca938c7e5fe5cf15526f606a3a6c
--- /dev/null
+++ b/include/dt-bindings/media/qcom,iris.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+#ifndef _DT_BINDINGS_MEDIA_QCOM_IRIS_H
+#define _DT_BINDINGS_MEDIA_QCOM_IRIS_H
+
+/* Function identifiers for iommu-map to attach for the context bank devices */
+#define IRIS_BITSTREAM 0x100
+#define IRIS_NON_PIXEL 0x101
+#define IRIS_PIXEL 0x102
+#define IRIS_SECURE_BITSTREAM 0x200
+#define IRIS_SECURE_NON_PIXEL 0x201
+#define IRIS_SECURE_PIXEL 0x202
+#define IRIS_FIRMWARE 0x300
+
+#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 16:49 ` Konrad Dybcio
2026-02-27 14:11 ` [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses Vikash Garodia
` (5 subsequent siblings)
7 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Currently the driver switches the vcodec GDSC to hardware (HW) mode
before firmware load and boot sequence. GDSC can be powered off, keeping
in hw mode, thereby the vcodec registers programmed in TrustZone (TZ)
carry default (reset) values.
Move the transition to HW mode after firmware load and boot sequence.
The bug was exposed with driver configuring different stream ids to
different devices via iommu-map. With registers carrying reset values,
VPU would not generate desired stream-id, thereby leading to SMMU fault.
For vpu4, when GDSC is switched to HW mode, there is a need to perform
the reset operation. Without reset, there are occassional issues of
register corruption observed. Hence the vpu GDSC switch also involves
the reset.
Fixes: dde659d37036 ("media: iris: Introduce vpu ops for vpu4 with necessary hooks")
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_core.c | 4 ++++
drivers/media/platform/qcom/iris/iris_hfi_common.c | 4 ++++
drivers/media/platform/qcom/iris/iris_vpu2.c | 1 +
drivers/media/platform/qcom/iris/iris_vpu3x.c | 9 +++-----
drivers/media/platform/qcom/iris/iris_vpu4x.c | 24 ++++++++++++----------
drivers/media/platform/qcom/iris/iris_vpu_common.c | 16 +++++++++------
drivers/media/platform/qcom/iris/iris_vpu_common.h | 3 +++
7 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_core.c b/drivers/media/platform/qcom/iris/iris_core.c
index 8406c48d635b6eba0879396ce9f9ae2292743f09..dbaac01eb15a0e622e85635fddd29c1f7fc18662 100644
--- a/drivers/media/platform/qcom/iris/iris_core.c
+++ b/drivers/media/platform/qcom/iris/iris_core.c
@@ -75,6 +75,10 @@ int iris_core_init(struct iris_core *core)
if (ret)
goto error_unload_fw;
+ ret = iris_vpu_switch_to_hwmode(core);
+ if (ret)
+ goto error_unload_fw;
+
ret = iris_hfi_core_init(core);
if (ret)
goto error_unload_fw;
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.c b/drivers/media/platform/qcom/iris/iris_hfi_common.c
index 92112eb16c11048e28230a2926dfb46e3163aada..621c66593d88d47ef3438c98a07cb29421c4e375 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_common.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_common.c
@@ -159,6 +159,10 @@ int iris_hfi_pm_resume(struct iris_core *core)
if (ret)
goto err_suspend_hw;
+ ret = iris_vpu_switch_to_hwmode(core);
+ if (ret)
+ goto err_suspend_hw;
+
ret = ops->sys_interframe_powercollapse(core);
if (ret)
goto err_suspend_hw;
diff --git a/drivers/media/platform/qcom/iris/iris_vpu2.c b/drivers/media/platform/qcom/iris/iris_vpu2.c
index 9c103a2e4e4eafee101a8a9b168fdc8ca76e277d..01ef40f3895743b3784464e2d5ba2de1aeca5a4a 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu2.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu2.c
@@ -44,4 +44,5 @@ const struct vpu_ops iris_vpu2_ops = {
.power_off_controller = iris_vpu_power_off_controller,
.power_on_controller = iris_vpu_power_on_controller,
.calc_freq = iris_vpu2_calc_freq,
+ .set_hwmode = iris_vpu_set_hwmode,
};
diff --git a/drivers/media/platform/qcom/iris/iris_vpu3x.c b/drivers/media/platform/qcom/iris/iris_vpu3x.c
index fe4423b951b1e9e31d06dffc69d18071cc985731..3dad47be78b58f6cd5ed6f333b3376571a04dbf0 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu3x.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu3x.c
@@ -234,14 +234,8 @@ static int iris_vpu35_power_on_hw(struct iris_core *core)
if (ret)
goto err_disable_hw_free_clk;
- ret = dev_pm_genpd_set_hwmode(core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN], true);
- if (ret)
- goto err_disable_hw_clk;
-
return 0;
-err_disable_hw_clk:
- iris_disable_unprepare_clock(core, IRIS_HW_CLK);
err_disable_hw_free_clk:
iris_disable_unprepare_clock(core, IRIS_HW_FREERUN_CLK);
err_disable_axi_clk:
@@ -266,6 +260,7 @@ const struct vpu_ops iris_vpu3_ops = {
.power_off_controller = iris_vpu_power_off_controller,
.power_on_controller = iris_vpu_power_on_controller,
.calc_freq = iris_vpu3x_vpu4x_calculate_frequency,
+ .set_hwmode = iris_vpu_set_hwmode,
};
const struct vpu_ops iris_vpu33_ops = {
@@ -274,6 +269,7 @@ const struct vpu_ops iris_vpu33_ops = {
.power_off_controller = iris_vpu33_power_off_controller,
.power_on_controller = iris_vpu_power_on_controller,
.calc_freq = iris_vpu3x_vpu4x_calculate_frequency,
+ .set_hwmode = iris_vpu_set_hwmode,
};
const struct vpu_ops iris_vpu35_ops = {
@@ -283,4 +279,5 @@ const struct vpu_ops iris_vpu35_ops = {
.power_on_controller = iris_vpu35_vpu4x_power_on_controller,
.program_bootup_registers = iris_vpu35_vpu4x_program_bootup_registers,
.calc_freq = iris_vpu3x_vpu4x_calculate_frequency,
+ .set_hwmode = iris_vpu_set_hwmode,
};
diff --git a/drivers/media/platform/qcom/iris/iris_vpu4x.c b/drivers/media/platform/qcom/iris/iris_vpu4x.c
index a8db02ce5c5ec583c4027166b34ce51d3d683b4e..02e100a4045fced33d7a3545b632cc5f0955233f 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu4x.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu4x.c
@@ -252,21 +252,10 @@ static int iris_vpu4x_power_on_hardware(struct iris_core *core)
ret = iris_vpu4x_power_on_apv(core);
if (ret)
goto disable_hw_clocks;
-
- iris_vpu4x_ahb_sync_reset_apv(core);
}
- iris_vpu4x_ahb_sync_reset_hardware(core);
-
- ret = iris_vpu4x_genpd_set_hwmode(core, true, efuse_value);
- if (ret)
- goto disable_apv_power_domain;
-
return 0;
-disable_apv_power_domain:
- if (!(efuse_value & DISABLE_VIDEO_APV_BIT))
- iris_vpu4x_power_off_apv(core);
disable_hw_clocks:
iris_vpu4x_disable_hardware_clocks(core, efuse_value);
disable_vpp1_power_domain:
@@ -359,6 +348,18 @@ static void iris_vpu4x_power_off_hardware(struct iris_core *core)
iris_disable_power_domains(core, core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN]);
}
+static int iris_vpu4x_set_hwmode(struct iris_core *core)
+{
+ u32 efuse_value = readl(core->reg_base + WRAPPER_EFUSE_MONITOR);
+
+ if (!(efuse_value & DISABLE_VIDEO_APV_BIT))
+ iris_vpu4x_ahb_sync_reset_apv(core);
+
+ iris_vpu4x_ahb_sync_reset_hardware(core);
+
+ return iris_vpu4x_genpd_set_hwmode(core, true, efuse_value);
+}
+
const struct vpu_ops iris_vpu4x_ops = {
.power_off_hw = iris_vpu4x_power_off_hardware,
.power_on_hw = iris_vpu4x_power_on_hardware,
@@ -366,4 +367,5 @@ const struct vpu_ops iris_vpu4x_ops = {
.power_on_controller = iris_vpu35_vpu4x_power_on_controller,
.program_bootup_registers = iris_vpu35_vpu4x_program_bootup_registers,
.calc_freq = iris_vpu3x_vpu4x_calculate_frequency,
+ .set_hwmode = iris_vpu4x_set_hwmode,
};
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c
index 548e5f1727fdb7543f76a1871f17257fa2360733..69e6126dc4d95ed9e5fccf596205e84ec0bfc82d 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu_common.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c
@@ -292,14 +292,8 @@ int iris_vpu_power_on_hw(struct iris_core *core)
if (ret && ret != -ENOENT)
goto err_disable_hw_clock;
- ret = dev_pm_genpd_set_hwmode(core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN], true);
- if (ret)
- goto err_disable_hw_ahb_clock;
-
return 0;
-err_disable_hw_ahb_clock:
- iris_disable_unprepare_clock(core, IRIS_HW_AHB_CLK);
err_disable_hw_clock:
iris_disable_unprepare_clock(core, IRIS_HW_CLK);
err_disable_power:
@@ -308,6 +302,16 @@ int iris_vpu_power_on_hw(struct iris_core *core)
return ret;
}
+int iris_vpu_set_hwmode(struct iris_core *core)
+{
+ return dev_pm_genpd_set_hwmode(core->pmdomain_tbl->pd_devs[IRIS_HW_POWER_DOMAIN], true);
+}
+
+int iris_vpu_switch_to_hwmode(struct iris_core *core)
+{
+ return core->iris_platform_data->vpu_ops->set_hwmode(core);
+}
+
int iris_vpu35_vpu4x_power_off_controller(struct iris_core *core)
{
u32 clk_rst_tbl_size = core->iris_platform_data->clk_rst_tbl_size;
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h
index f6dffc613b822341fb21e12de6b1395202f62cde..dee3b1349c5e869619c7f7c294dd711f9ff72b92 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu_common.h
+++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h
@@ -21,6 +21,7 @@ struct vpu_ops {
int (*power_on_controller)(struct iris_core *core);
void (*program_bootup_registers)(struct iris_core *core);
u64 (*calc_freq)(struct iris_inst *inst, size_t data_size);
+ int (*set_hwmode)(struct iris_core *core);
};
int iris_vpu_boot_firmware(struct iris_core *core);
@@ -30,6 +31,8 @@ int iris_vpu_watchdog(struct iris_core *core, u32 intr_status);
int iris_vpu_prepare_pc(struct iris_core *core);
int iris_vpu_power_on_controller(struct iris_core *core);
int iris_vpu_power_on_hw(struct iris_core *core);
+int iris_vpu_set_hwmode(struct iris_core *core);
+int iris_vpu_switch_to_hwmode(struct iris_core *core);
int iris_vpu_power_on(struct iris_core *core);
int iris_vpu_power_off_controller(struct iris_core *core);
void iris_vpu_power_off_hw(struct iris_core *core);
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
2026-02-27 14:11 ` [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 15:49 ` Krzysztof Kozlowski
2026-02-27 20:14 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 4/7] media: iris: add context bank devices using iommu-map Vikash Garodia
` (4 subsequent siblings)
7 siblings, 2 replies; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Add iris vpu bus support and hooks the new bus into the iommu_buses
list. Iris devices need their own bus so that each iris device can run
its own dma_configure() logic.
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
drivers/iommu/iommu.c | 4 ++++
drivers/media/platform/qcom/iris/Makefile | 4 ++++
drivers/media/platform/qcom/iris/iris_vpu_bus.c | 32 +++++++++++++++++++++++++
include/linux/iris_vpu_bus.h | 13 ++++++++++
4 files changed, 53 insertions(+)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 35db5178095404fec87cd0f18e44ea97cf354e78..fd5fb7c10da22ab548d359ca1f44504acc3d646c 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -13,6 +13,7 @@
#include <linux/bug.h>
#include <linux/types.h>
#include <linux/init.h>
+#include <linux/iris_vpu_bus.h>
#include <linux/export.h>
#include <linux/slab.h>
#include <linux/errno.h>
@@ -178,6 +179,9 @@ static const struct bus_type * const iommu_buses[] = {
#ifdef CONFIG_CDX_BUS
&cdx_bus_type,
#endif
+#if IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)
+ &iris_vpu_bus_type,
+#endif
};
/*
diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
index 2abbd3aeb4af07e52bf372a4b2f352463529c92c..6f4052b98491aeddc299669334d4c93e9a3420e4 100644
--- a/drivers/media/platform/qcom/iris/Makefile
+++ b/drivers/media/platform/qcom/iris/Makefile
@@ -31,3 +31,7 @@ qcom-iris-objs += iris_platform_gen1.o
endif
obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o
+
+ifdef CONFIG_VIDEO_QCOM_IRIS
+obj-y += iris_vpu_bus.o
+endif
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_bus.c b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
new file mode 100644
index 0000000000000000000000000000000000000000..34ce78d9b0ff1feda15ba4f060a56d02749a0858
--- /dev/null
+++ b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <linux/device.h>
+#include <linux/of_device.h>
+
+#include "iris_platform_common.h"
+
+static int iris_vpu_bus_dma_configure(struct device *dev)
+{
+ struct iris_context_bank *cb = dev_get_drvdata(dev);
+
+ if (!cb)
+ return -ENODEV;
+
+ return of_dma_configure_id(dev, dev->parent->of_node, true, &cb->f_id);
+}
+
+const struct bus_type iris_vpu_bus_type = {
+ .name = "iris-bus",
+ .dma_configure = iris_vpu_bus_dma_configure,
+};
+EXPORT_SYMBOL_GPL(iris_vpu_bus_type);
+
+static int __init iris_vpu_bus_init(void)
+{
+ return bus_register(&iris_vpu_bus_type);
+}
+
+postcore_initcall(iris_vpu_bus_init);
diff --git a/include/linux/iris_vpu_bus.h b/include/linux/iris_vpu_bus.h
new file mode 100644
index 0000000000000000000000000000000000000000..8aba472fcadd269e196b7243da5660deaff31abb
--- /dev/null
+++ b/include/linux/iris_vpu_bus.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef __IRIS_VPU_BUS_H__
+#define __IRIS_VPU_BUS_H__
+
+#if IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)
+extern const struct bus_type iris_vpu_bus_type;
+#endif
+
+#endif /* __IRIS_VPU_BUS_H__ */
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
` (2 preceding siblings ...)
2026-02-27 14:11 ` [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 20:20 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 5/7] media: iris: add helper to select context bank device Vikash Garodia
` (3 subsequent siblings)
7 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Introduce different context banks(CB) and the associated buffer region.
Different stream IDs from VPU would be associated to one of these CB.
Multiple CBs are needed to increase the IOVA for the video usecases like
higher concurrent sessions.
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
.../platform/qcom/iris/iris_platform_common.h | 18 +++++++
drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
drivers/media/platform/qcom/iris/iris_resources.h | 1 +
4 files changed, 111 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -204,6 +204,22 @@ struct icc_vote_data {
u32 fps;
};
+enum iris_buffer_region {
+ IRIS_BITSTREAM_REGION = BIT(0),
+ IRIS_NON_PIXEL_REGION = BIT(1),
+ IRIS_PIXEL_REGION = BIT(2),
+ IRIS_SECURE_BITSTREAM_REGION = BIT(3),
+ IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
+ IRIS_SECURE_PIXEL_REGION = BIT(5),
+};
+
+struct iris_context_bank {
+ struct device *dev;
+ const char *name;
+ const u32 f_id;
+ const enum iris_buffer_region region;
+};
+
enum platform_pm_domain_type {
IRIS_CTRL_POWER_DOMAIN,
IRIS_HW_POWER_DOMAIN,
@@ -246,6 +262,8 @@ struct iris_platform_data {
u32 inst_fw_caps_enc_size;
const struct tz_cp_config *tz_cp_config_data;
u32 tz_cp_config_data_size;
+ struct iris_context_bank *cb_data;
+ u32 cb_data_size;
u32 core_arch;
u32 hw_response_timeout;
struct ubwc_config_data *ubwc_config;
diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index ddaacda523ecb9990af0dd0640196223fbcc2cab..557adb038328a75510591d91569819abc0b7b1c9 100644
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -123,6 +123,49 @@ static int iris_init_resets(struct iris_core *core)
core->iris_platform_data->controller_rst_tbl_size);
}
+static void iris_destroy_child_device(struct iris_context_bank *cb)
+{
+ struct device *dev = cb->dev;
+
+ if (dev)
+ device_unregister(dev);
+
+ cb->dev = NULL;
+}
+
+static void iris_deinit_context_bank_devices(struct iris_core *core)
+{
+ struct iris_context_bank *cb;
+ int i;
+
+ for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
+ cb = &core->iris_platform_data->cb_data[i];
+ iris_destroy_child_device(cb);
+ }
+}
+
+static int iris_init_context_bank_devices(struct iris_core *core)
+{
+ struct iris_context_bank *cb;
+ int ret, i;
+
+ for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
+ cb = &core->iris_platform_data->cb_data[i];
+
+ ret = iris_create_child_device_and_map(core, cb);
+ if (ret)
+ goto err_deinit_cb;
+ }
+
+ return 0;
+
+err_deinit_cb:
+ while (i-- > 0)
+ iris_destroy_child_device(&core->iris_platform_data->cb_data[i]);
+
+ return ret;
+}
+
static int iris_init_resources(struct iris_core *core)
{
int ret;
@@ -193,6 +236,7 @@ static void iris_remove(struct platform_device *pdev)
return;
iris_core_deinit(core);
+ iris_deinit_context_bank_devices(core);
video_unregister_device(core->vdev_dec);
video_unregister_device(core->vdev_enc);
@@ -275,12 +319,18 @@ static int iris_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, core);
- dma_mask = core->iris_platform_data->dma_mask;
-
- ret = dma_set_mask_and_coherent(dev, dma_mask);
+ ret = iris_init_context_bank_devices(core);
if (ret)
goto err_vdev_unreg_enc;
+ dma_mask = core->iris_platform_data->dma_mask;
+
+ if (device_iommu_mapped(core->dev)) {
+ ret = dma_set_mask_and_coherent(core->dev, dma_mask);
+ if (ret)
+ goto err_deinit_cb;
+ }
+
dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
dma_set_seg_boundary(&pdev->dev, DMA_BIT_MASK(32));
@@ -288,10 +338,12 @@ static int iris_probe(struct platform_device *pdev)
pm_runtime_use_autosuspend(core->dev);
ret = devm_pm_runtime_enable(core->dev);
if (ret)
- goto err_vdev_unreg_enc;
+ goto err_deinit_cb;
return 0;
+err_deinit_cb:
+ iris_deinit_context_bank_devices(core);
err_vdev_unreg_enc:
video_unregister_device(core->vdev_enc);
err_vdev_unreg_dec:
diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index 773f6548370a257b8ae7332242544266cbbd61a9..be58e8620086d0f82c2c2bda29247483f5c56d79 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -6,6 +6,7 @@
#include <linux/clk.h>
#include <linux/devfreq.h>
#include <linux/interconnect.h>
+#include <linux/iris_vpu_bus.h>
#include <linux/pm_domain.h>
#include <linux/pm_opp.h>
#include <linux/pm_runtime.h>
@@ -141,3 +142,38 @@ int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type
return 0;
}
+
+static void iris_device_release(struct device *dev)
+{
+ dev_set_drvdata(dev, NULL);
+ kfree(dev);
+}
+
+int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb)
+{
+ struct device *dev;
+ int ret;
+
+ dev = kzalloc_obj(*dev);
+ if (!dev)
+ return -ENOMEM;
+
+ dev->release = iris_device_release;
+ dev->bus = &iris_vpu_bus_type;
+ dev->parent = core->dev;
+ dev->coherent_dma_mask = core->iris_platform_data->dma_mask;
+ dev->dma_mask = &dev->coherent_dma_mask;
+
+ dev_set_name(dev, "%s", cb->name);
+ dev_set_drvdata(dev, cb);
+
+ ret = device_register(dev);
+ if (ret) {
+ put_device(dev);
+ return ret;
+ }
+
+ cb->dev = dev;
+
+ return 0;
+}
diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
index 6bfbd2dc6db095ec05e53c894e048285f82446c6..b7efe15facb203eea9ae13d5f0abdcc2ea718b4d 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.h
+++ b/drivers/media/platform/qcom/iris/iris_resources.h
@@ -15,5 +15,6 @@ int iris_unset_icc_bw(struct iris_core *core);
int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
+int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH v2 5/7] media: iris: add helper to select context bank device
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
` (3 preceding siblings ...)
2026-02-27 14:11 ` [PATCH v2 4/7] media: iris: add context bank devices using iommu-map Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 20:27 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation Vikash Garodia
` (2 subsequent siblings)
7 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Depending on the buffer type (input, output, internal and interface
queues), associated context bank is selected, if available. Fallback to
parent device for backward compatibility.
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_buffer.c | 7 +--
drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++---
drivers/media/platform/qcom/iris/iris_resources.c | 60 +++++++++++++++++++++++
drivers/media/platform/qcom/iris/iris_resources.h | 2 +
drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
6 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
index 9151f43bc6b9c2c34c803de4231d1e6de0bec6c4..95962c19c334f08a74c5b7e8ba978ab631a65e9c 100644
--- a/drivers/media/platform/qcom/iris/iris_buffer.c
+++ b/drivers/media/platform/qcom/iris/iris_buffer.c
@@ -335,8 +335,8 @@ void iris_get_internal_buffers(struct iris_inst *inst, u32 plane)
static int iris_create_internal_buffer(struct iris_inst *inst,
enum iris_buffer_type buffer_type, u32 index)
{
+ struct device *dev = iris_get_cb_dev(inst->core, inst, buffer_type);
struct iris_buffers *buffers = &inst->buffers[buffer_type];
- struct iris_core *core = inst->core;
struct iris_buffer *buffer;
if (!buffers->size)
@@ -352,7 +352,7 @@ static int iris_create_internal_buffer(struct iris_inst *inst,
buffer->buffer_size = buffers->size;
buffer->dma_attrs = DMA_ATTR_WRITE_COMBINE | DMA_ATTR_NO_KERNEL_MAPPING;
- buffer->kvaddr = dma_alloc_attrs(core->dev, buffer->buffer_size,
+ buffer->kvaddr = dma_alloc_attrs(dev, buffer->buffer_size,
&buffer->device_addr, GFP_KERNEL, buffer->dma_attrs);
if (!buffer->kvaddr) {
kfree(buffer);
@@ -490,9 +490,10 @@ int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane)
int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buffer)
{
struct iris_core *core = inst->core;
+ struct device *dev = iris_get_cb_dev(core, inst, buffer->type);
list_del(&buffer->list);
- dma_free_attrs(core->dev, buffer->buffer_size, buffer->kvaddr,
+ dma_free_attrs(dev, buffer->buffer_size, buffer->kvaddr,
buffer->device_addr, buffer->dma_attrs);
kfree(buffer);
diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h
index 75bb767761824c4c02e0df9b765896cc093be333..9520aa290b44f06ed2004ad89940c19d1c08a3d2 100644
--- a/drivers/media/platform/qcom/iris/iris_buffer.h
+++ b/drivers/media/platform/qcom/iris/iris_buffer.h
@@ -28,6 +28,7 @@ struct iris_inst;
* @BUF_SCRATCH_2: buffer to store encoding context data for HW
* @BUF_VPSS: buffer to store VPSS context data for HW
* @BUF_PARTIAL: buffer for AV1 IBC data
+ * @BUF_HFI_QUEUE: buffer for hardware firmware interface queue
* @BUF_TYPE_MAX: max buffer types
*/
enum iris_buffer_type {
@@ -44,6 +45,7 @@ enum iris_buffer_type {
BUF_SCRATCH_2,
BUF_VPSS,
BUF_PARTIAL,
+ BUF_HFI_QUEUE,
BUF_TYPE_MAX,
};
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_queue.c b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
index b3ed06297953b902d5ea6c452385a88d5431ac66..c1241fb8dc6519020a063cbba87aed665701d7ae 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_queue.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
@@ -245,25 +245,26 @@ static void iris_hfi_queue_deinit(struct iris_iface_q_info *iface_q)
int iris_hfi_queues_init(struct iris_core *core)
{
+ struct device *dev = iris_get_cb_dev(core, NULL, BUF_HFI_QUEUE);
struct iris_hfi_queue_table_header *q_tbl_hdr;
u32 queue_size;
/* Iris hardware requires 4K queue alignment */
queue_size = ALIGN((sizeof(*q_tbl_hdr) + (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ)), SZ_4K);
- core->iface_q_table_vaddr = dma_alloc_attrs(core->dev, queue_size,
+ core->iface_q_table_vaddr = dma_alloc_attrs(dev, queue_size,
&core->iface_q_table_daddr,
GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
if (!core->iface_q_table_vaddr) {
- dev_err(core->dev, "queues alloc and map failed\n");
+ dev_err(dev, "queues alloc and map failed\n");
return -ENOMEM;
}
- core->sfr_vaddr = dma_alloc_attrs(core->dev, SFR_SIZE,
+ core->sfr_vaddr = dma_alloc_attrs(dev, SFR_SIZE,
&core->sfr_daddr,
GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
if (!core->sfr_vaddr) {
- dev_err(core->dev, "sfr alloc and map failed\n");
- dma_free_attrs(core->dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr,
+ dev_err(dev, "sfr alloc and map failed\n");
+ dma_free_attrs(dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr,
core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
return -ENOMEM;
}
@@ -291,6 +292,7 @@ int iris_hfi_queues_init(struct iris_core *core)
void iris_hfi_queues_deinit(struct iris_core *core)
{
+ struct device *dev = iris_get_cb_dev(core, NULL, BUF_HFI_QUEUE);
u32 queue_size;
if (!core->iface_q_table_vaddr)
@@ -300,7 +302,7 @@ void iris_hfi_queues_deinit(struct iris_core *core)
iris_hfi_queue_deinit(&core->message_queue);
iris_hfi_queue_deinit(&core->command_queue);
- dma_free_attrs(core->dev, SFR_SIZE, core->sfr_vaddr,
+ dma_free_attrs(dev, SFR_SIZE, core->sfr_vaddr,
core->sfr_daddr, DMA_ATTR_WRITE_COMBINE);
core->sfr_vaddr = NULL;
@@ -309,7 +311,7 @@ void iris_hfi_queues_deinit(struct iris_core *core)
queue_size = ALIGN(sizeof(struct iris_hfi_queue_table_header) +
(IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ), SZ_4K);
- dma_free_attrs(core->dev, queue_size, core->iface_q_table_vaddr,
+ dma_free_attrs(dev, queue_size, core->iface_q_table_vaddr,
core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
core->iface_q_table_vaddr = NULL;
diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
index be58e8620086d0f82c2c2bda29247483f5c56d79..65544cb0fa8fc4b250b0a0be1bb900d74b999d35 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.c
+++ b/drivers/media/platform/qcom/iris/iris_resources.c
@@ -13,6 +13,7 @@
#include <linux/reset.h>
#include "iris_core.h"
+#include "iris_instance.h"
#include "iris_resources.h"
#define BW_THRESHOLD 50000
@@ -177,3 +178,62 @@ int iris_create_child_device_and_map(struct iris_core *core, struct iris_context
return 0;
}
+
+static enum iris_buffer_region iris_get_region(struct iris_inst *inst,
+ enum iris_buffer_type buffer_type)
+{
+ switch (buffer_type) {
+ case BUF_INPUT:
+ if (inst && inst->domain == ENCODER)
+ return IRIS_PIXEL_REGION;
+ else if (inst && inst->domain == DECODER)
+ return IRIS_BITSTREAM_REGION;
+ break;
+ case BUF_OUTPUT:
+ if (inst && inst->domain == ENCODER)
+ return IRIS_BITSTREAM_REGION;
+ else if (inst && inst->domain == DECODER)
+ return IRIS_PIXEL_REGION;
+ break;
+ case BUF_BIN:
+ return IRIS_BITSTREAM_REGION;
+ case BUF_DPB:
+ case BUF_PARTIAL:
+ case BUF_SCRATCH_2:
+ case BUF_VPSS:
+ return IRIS_PIXEL_REGION;
+ case BUF_ARP:
+ case BUF_COMV:
+ case BUF_HFI_QUEUE:
+ case BUF_LINE:
+ case BUF_NON_COMV:
+ case BUF_PERSIST:
+ return IRIS_NON_PIXEL_REGION;
+ default:
+ return 0;
+ }
+
+ return 0;
+}
+
+struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
+ enum iris_buffer_type buffer_type)
+{
+ enum iris_buffer_region region;
+ struct device *dev = NULL;
+ int i;
+
+ region = iris_get_region(inst, buffer_type);
+
+ for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
+ if (core->iris_platform_data->cb_data[i].region & region) {
+ dev = core->iris_platform_data->cb_data[i].dev;
+ break;
+ }
+ }
+
+ if (!dev)
+ dev = core->dev;
+
+ return dev;
+}
diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
index b7efe15facb203eea9ae13d5f0abdcc2ea718b4d..ea31726f1789130fccf6b24540a62b86cb3c36ac 100644
--- a/drivers/media/platform/qcom/iris/iris_resources.h
+++ b/drivers/media/platform/qcom/iris/iris_resources.h
@@ -16,5 +16,7 @@ int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
+struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
+ enum iris_buffer_type buffer_type);
#endif
diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
index bd38d84c9cc79d15585ed5dd5f905a37521cb6dc..b61d7941d88662f34a9d2ab3b6c5bd9acf4b5df5 100644
--- a/drivers/media/platform/qcom/iris/iris_vidc.c
+++ b/drivers/media/platform/qcom/iris/iris_vidc.c
@@ -107,7 +107,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
src_vq->drv_priv = inst;
src_vq->buf_struct_size = sizeof(struct iris_buffer);
src_vq->min_reqbufs_allocation = MIN_BUFFERS;
- src_vq->dev = inst->core->dev;
+ src_vq->dev = iris_get_cb_dev(inst->core, inst, BUF_INPUT);
src_vq->lock = &inst->ctx_q_lock;
ret = vb2_queue_init(src_vq);
if (ret)
@@ -121,7 +121,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
dst_vq->drv_priv = inst;
dst_vq->buf_struct_size = sizeof(struct iris_buffer);
dst_vq->min_reqbufs_allocation = MIN_BUFFERS;
- dst_vq->dev = inst->core->dev;
+ dst_vq->dev = iris_get_cb_dev(inst->core, inst, BUF_OUTPUT);
dst_vq->lock = &inst->ctx_q_lock;
return vb2_queue_init(dst_vq);
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
` (4 preceding siblings ...)
2026-02-27 14:11 ` [PATCH v2 5/7] media: iris: add helper to select context bank device Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 20:28 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 7/7] media: iris: add platform data for kaanapali Vikash Garodia
2026-02-27 15:42 ` [PATCH v2 0/7] media: iris: add support for kaanapali platform Bryan O'Donoghue
7 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
The H265 decoder line buffer size calculation for iris4 (VPU4) was
previously reusing the iris3 formula. While this works for most
resolutions, certain configurations require a larger buffer size on
iris4, causing firmware errors during decode. This resolves firmware
failures seen with specific test vectors on kaanapali (iris4), and fixes
the following failing fluster tests
- PICSIZE_C_Bossen_1
- WPP_E_ericsson_MAIN_2
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
index 9270422c16019ba658ee8813940cb9110ad030a1..a4d599c49ce9052b609b9cedf65f669ba78b5407 100644
--- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
+++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
@@ -1755,6 +1755,55 @@ static u32 hfi_vpu4x_buffer_line_vp9d(u32 frame_width, u32 frame_height, u32 _yu
return lb_size + dpb_obp_size;
}
+static u32 hfi_vpu4x_buffer_line_h265d(u32 frame_width, u32 frame_height, bool is_opb,
+ u32 num_vpp_pipes)
+{
+ u32 num_lcu_per_pipe, fe_left_lb, se_left_lb, vsp_left_lb, top_lb, qp_size,
+ dpb_obp = 0, lcu_size = 16;
+
+ num_lcu_per_pipe = (DIV_ROUND_UP(frame_height, lcu_size) / num_vpp_pipes) +
+ (DIV_ROUND_UP(frame_height, lcu_size) % num_vpp_pipes);
+
+ fe_left_lb = ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT) *
+ FE_LFT_CTRL_LINE_NUMBERS;
+ fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT) *
+ FE_LFT_DB_DATA_LINE_NUMBERS;
+ fe_left_lb += ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT);
+ fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT);
+ fe_left_lb += ALIGN((DMA_ALIGNMENT * 8 * num_lcu_per_pipe), DMA_ALIGNMENT) *
+ FE_LFT_LR_DATA_LINE_NUMBERS;
+
+ if (is_opb)
+ dpb_obp = size_dpb_opb(frame_height, lcu_size) * num_vpp_pipes;
+
+ se_left_lb = max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_16_BYTES) >> 3) *
+ MAX_SE_NBR_CTRL_LCU16_LINE_BUFFER_SIZE,
+ max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_32_BYTES) >> 3) *
+ MAX_SE_NBR_CTRL_LCU32_LINE_BUFFER_SIZE,
+ (ALIGN(frame_height, BUFFER_ALIGNMENT_64_BYTES) >> 3) *
+ MAX_SE_NBR_CTRL_LCU64_LINE_BUFFER_SIZE));
+
+ vsp_left_lb = ALIGN(DIV_ROUND_UP(frame_height, BUFFER_ALIGNMENT_64_BYTES) *
+ H265_NUM_TILE_ROW, DMA_ALIGNMENT);
+
+ top_lb = ALIGN((DMA_ALIGNMENT * DIV_ROUND_UP(frame_width, lcu_size)), DMA_ALIGNMENT) *
+ FE_TOP_CTRL_LINE_NUMBERS;
+ top_lb += ALIGN(DMA_ALIGNMENT * 2 * DIV_ROUND_UP(frame_width, lcu_size), DMA_ALIGNMENT) *
+ FE_TOP_DATA_LUMA_LINE_NUMBERS;
+ top_lb += ALIGN(DMA_ALIGNMENT * 2 * (DIV_ROUND_UP(frame_width, lcu_size) + 1),
+ DMA_ALIGNMENT) * FE_TOP_DATA_CHROMA_LINE_NUMBERS;
+ top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 2, DMA_ALIGNMENT);
+ top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 6, DMA_ALIGNMENT);
+ top_lb += size_h265d_lb_vsp_top(frame_width, frame_height);
+
+ qp_size = size_h265d_qp(frame_width, frame_height);
+
+ return ((ALIGN(dpb_obp, DMA_ALIGNMENT) + ALIGN(se_left_lb, DMA_ALIGNMENT) +
+ ALIGN(vsp_left_lb, DMA_ALIGNMENT)) * num_vpp_pipes) +
+ ALIGN(fe_left_lb, DMA_ALIGNMENT) + ALIGN(top_lb, DMA_ALIGNMENT) +
+ ALIGN(qp_size, DMA_ALIGNMENT);
+}
+
static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
{
u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
@@ -1770,7 +1819,7 @@ static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
if (inst->codec == V4L2_PIX_FMT_H264)
return hfi_buffer_line_h264d(width, height, is_opb, num_vpp_pipes);
else if (inst->codec == V4L2_PIX_FMT_HEVC)
- return hfi_buffer_line_h265d(width, height, is_opb, num_vpp_pipes);
+ return hfi_vpu4x_buffer_line_h265d(width, height, is_opb, num_vpp_pipes);
else if (inst->codec == V4L2_PIX_FMT_VP9)
return hfi_vpu4x_buffer_line_vp9d(width, height, out_min_count, is_opb,
num_vpp_pipes);
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [PATCH v2 7/7] media: iris: add platform data for kaanapali
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
` (5 preceding siblings ...)
2026-02-27 14:11 ` [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation Vikash Garodia
@ 2026-02-27 14:11 ` Vikash Garodia
2026-02-27 15:48 ` Krzysztof Kozlowski
2026-02-27 15:42 ` [PATCH v2 0/7] media: iris: add support for kaanapali platform Bryan O'Donoghue
7 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-02-27 14:11 UTC (permalink / raw)
To: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue, Vikash Garodia
Add support for the kaanapali platform by re-using the SM8550
definitions and using the vpu4 ops.
Move the configurations that differs in a per-SoC platform header, that
will contain SoC specific data.
Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
---
.../platform/qcom/iris/iris_platform_common.h | 1 +
.../media/platform/qcom/iris/iris_platform_gen2.c | 90 ++++++++++++++++++++++
.../platform/qcom/iris/iris_platform_kaanapali.h | 86 +++++++++++++++++++++
drivers/media/platform/qcom/iris/iris_probe.c | 4 +
4 files changed, 181 insertions(+)
diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 03c50d6e54853fca34d7d32f65d09eb80945fcdd..34c8ae7f9f957936b6219d8557ff3d86d309cb2a 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -41,6 +41,7 @@ enum pipe_type {
PIPE_4 = 4,
};
+extern const struct iris_platform_data kaanapali_data;
extern const struct iris_platform_data qcs8300_data;
extern const struct iris_platform_data sc7280_data;
extern const struct iris_platform_data sm8250_data;
diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 5da90d47f9c6eab4a7e6b17841fdc0e599397bf7..df906f6b9fcd80100872a12815036a3aad9e925b 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -12,6 +12,7 @@
#include "iris_vpu_buffer.h"
#include "iris_vpu_common.h"
+#include "iris_platform_kaanapali.h"
#include "iris_platform_qcs8300.h"
#include "iris_platform_sm8650.h"
#include "iris_platform_sm8750.h"
@@ -921,6 +922,95 @@ static const u32 sm8550_enc_op_int_buf_tbl[] = {
BUF_SCRATCH_2,
};
+const struct iris_platform_data kaanapali_data = {
+ .get_instance = iris_hfi_gen2_get_instance,
+ .init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
+ .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
+ .get_vpu_buffer_size = iris_vpu4x_buf_size,
+ .vpu_ops = &iris_vpu4x_ops,
+ .set_preset_registers = iris_set_sm8550_preset_registers,
+ .icc_tbl = sm8550_icc_table,
+ .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table),
+ .clk_rst_tbl = kaanapali_clk_reset_table,
+ .clk_rst_tbl_size = ARRAY_SIZE(kaanapali_clk_reset_table),
+ .bw_tbl_dec = sm8550_bw_table_dec,
+ .bw_tbl_dec_size = ARRAY_SIZE(sm8550_bw_table_dec),
+ .pmdomain_tbl = kaanapali_pmdomain_table,
+ .pmdomain_tbl_size = ARRAY_SIZE(kaanapali_pmdomain_table),
+ .opp_pd_tbl = sm8550_opp_pd_table,
+ .opp_pd_tbl_size = ARRAY_SIZE(sm8550_opp_pd_table),
+ .clk_tbl = kaanapali_clk_table,
+ .clk_tbl_size = ARRAY_SIZE(kaanapali_clk_table),
+ .opp_clk_tbl = kaanapali_opp_clk_table,
+ /* Upper bound of DMA address range */
+ .dma_mask = 0xffc00000 - 1,
+ .fwname = "qcom/vpu/vpu40_p2_s7.mbn",
+ .pas_id = IRIS_PAS_ID,
+ .inst_iris_fmts = platform_fmts_sm8550_dec,
+ .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec),
+ .inst_caps = &platform_inst_cap_sm8550,
+ .inst_fw_caps_dec = inst_fw_cap_sm8550_dec,
+ .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec),
+ .inst_fw_caps_enc = inst_fw_cap_sm8550_enc,
+ .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8550_enc),
+ .tz_cp_config_data = tz_cp_config_kaanapali,
+ .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_kaanapali),
+ .cb_data = kaanapali_cb_data,
+ .cb_data_size = ARRAY_SIZE(kaanapali_cb_data),
+ .core_arch = VIDEO_ARCH_LX,
+ .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE,
+ .ubwc_config = &ubwc_config_sm8550,
+ .num_vpp_pipe = 2,
+ .max_session_count = 16,
+ .max_core_mbpf = NUM_MBS_8K * 2,
+ .max_core_mbps = ((8192 * 4320) / 256) * 60,
+ .dec_input_config_params_default =
+ sm8550_vdec_input_config_params_default,
+ .dec_input_config_params_default_size =
+ ARRAY_SIZE(sm8550_vdec_input_config_params_default),
+ .dec_input_config_params_hevc =
+ sm8550_vdec_input_config_param_hevc,
+ .dec_input_config_params_hevc_size =
+ ARRAY_SIZE(sm8550_vdec_input_config_param_hevc),
+ .dec_input_config_params_vp9 =
+ sm8550_vdec_input_config_param_vp9,
+ .dec_input_config_params_vp9_size =
+ ARRAY_SIZE(sm8550_vdec_input_config_param_vp9),
+ .dec_output_config_params =
+ sm8550_vdec_output_config_params,
+ .dec_output_config_params_size =
+ ARRAY_SIZE(sm8550_vdec_output_config_params),
+
+ .enc_input_config_params =
+ sm8550_venc_input_config_params,
+ .enc_input_config_params_size =
+ ARRAY_SIZE(sm8550_venc_input_config_params),
+ .enc_output_config_params =
+ sm8550_venc_output_config_params,
+ .enc_output_config_params_size =
+ ARRAY_SIZE(sm8550_venc_output_config_params),
+
+ .dec_input_prop = sm8550_vdec_subscribe_input_properties,
+ .dec_input_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_input_properties),
+ .dec_output_prop_avc = sm8550_vdec_subscribe_output_properties_avc,
+ .dec_output_prop_avc_size =
+ ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_avc),
+ .dec_output_prop_hevc = sm8550_vdec_subscribe_output_properties_hevc,
+ .dec_output_prop_hevc_size =
+ ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_hevc),
+ .dec_output_prop_vp9 = sm8550_vdec_subscribe_output_properties_vp9,
+ .dec_output_prop_vp9_size =
+ ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_vp9),
+
+ .dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
+ .dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),
+ .dec_op_int_buf_tbl = sm8550_dec_op_int_buf_tbl,
+ .dec_op_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_op_int_buf_tbl),
+
+ .enc_op_int_buf_tbl = sm8550_enc_op_int_buf_tbl,
+ .enc_op_int_buf_tbl_size = ARRAY_SIZE(sm8550_enc_op_int_buf_tbl),
+};
+
const struct iris_platform_data sm8550_data = {
.get_instance = iris_hfi_gen2_get_instance,
.init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
diff --git a/drivers/media/platform/qcom/iris/iris_platform_kaanapali.h b/drivers/media/platform/qcom/iris/iris_platform_kaanapali.h
new file mode 100644
index 0000000000000000000000000000000000000000..ecfebc898e727ccadd2ea5d7d2d43fcba476b779
--- /dev/null
+++ b/drivers/media/platform/qcom/iris/iris_platform_kaanapali.h
@@ -0,0 +1,86 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef __IRIS_PLATFORM_KAANAPALI_H__
+#define __IRIS_PLATFORM_KAANAPALI_H__
+
+#include <dt-bindings/media/qcom,iris.h>
+
+#define VIDEO_REGION_VM0_SECURE_NP_ID 1
+#define VIDEO_REGION_VM0_NONSECURE_NP_ID 5
+
+static const char *const kaanapali_clk_reset_table[] = {
+ "bus0",
+ "bus1",
+ "core",
+ "vcodec0_core",
+};
+
+static const char *const kaanapali_pmdomain_table[] = {
+ "venus",
+ "vcodec0",
+ "vpp0",
+ "vpp1",
+ "apv",
+};
+
+static const struct platform_clk_data kaanapali_clk_table[] = {
+ { IRIS_AXI_CLK, "iface" },
+ { IRIS_CTRL_CLK, "core" },
+ { IRIS_HW_CLK, "vcodec0_core" },
+ { IRIS_AXI1_CLK, "iface1" },
+ { IRIS_CTRL_FREERUN_CLK, "core_freerun" },
+ { IRIS_HW_FREERUN_CLK, "vcodec0_core_freerun" },
+ { IRIS_BSE_HW_CLK, "vcodec_bse" },
+ { IRIS_VPP0_HW_CLK, "vcodec_vpp0" },
+ { IRIS_VPP1_HW_CLK, "vcodec_vpp1" },
+ { IRIS_APV_HW_CLK, "vcodec_apv" },
+};
+
+static const char *const kaanapali_opp_clk_table[] = {
+ "vcodec0_core",
+ "vcodec_apv",
+ "vcodec_bse",
+ "core",
+ NULL,
+};
+
+static struct tz_cp_config tz_cp_config_kaanapali[] = {
+ {
+ .cp_start = VIDEO_REGION_VM0_SECURE_NP_ID,
+ .cp_size = 0,
+ .cp_nonpixel_start = 0x01000000,
+ .cp_nonpixel_size = 0x24800000,
+ },
+ {
+ .cp_start = VIDEO_REGION_VM0_NONSECURE_NP_ID,
+ .cp_size = 0,
+ .cp_nonpixel_start = 0x25800000,
+ .cp_nonpixel_size = 0xda400000,
+ },
+};
+
+static struct iris_context_bank kaanapali_cb_data[] = {
+ {
+ .dev = NULL,
+ .name = "iris_bitstream",
+ .f_id = IRIS_BITSTREAM,
+ .region = IRIS_BITSTREAM_REGION,
+ },
+ {
+ .dev = NULL,
+ .name = "iris_non_pixel",
+ .f_id = IRIS_NON_PIXEL,
+ .region = IRIS_NON_PIXEL_REGION,
+ },
+ {
+ .dev = NULL,
+ .name = "iris_pixel",
+ .f_id = IRIS_PIXEL,
+ .region = IRIS_PIXEL_REGION,
+ },
+};
+
+#endif /* __IRIS_PLATFORM_KAANAPALI_H__ */
diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index 557adb038328a75510591d91569819abc0b7b1c9..e30b159b42c75b288ef02624480cd733f9cf6f50 100644
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -400,6 +400,10 @@ static const struct dev_pm_ops iris_pm_ops = {
};
static const struct of_device_id iris_dt_match[] = {
+ {
+ .compatible = "qcom,kaanapali-iris",
+ .data = &kaanapali_data,
+ },
{
.compatible = "qcom,qcs8300-iris",
.data = &qcs8300_data,
--
2.34.1
^ permalink raw reply related [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
@ 2026-02-27 15:42 ` Rob Herring (Arm)
2026-02-27 15:50 ` Krzysztof Kozlowski
2026-02-27 19:52 ` Dmitry Baryshkov
2 siblings, 0 replies; 47+ messages in thread
From: Rob Herring (Arm) @ 2026-02-27 15:42 UTC (permalink / raw)
To: Vikash Garodia
Cc: iommu, Robin Murphy, Mauro Carvalho Chehab, Bryan O'Donoghue,
Dikshita Agarwal, Will Deacon, Bryan O'Donoghue, Joerg Roedel,
Saravana Kannan, Stefan Schmidt, Vishnu Reddy, linux-media,
Conor Dooley, Krzysztof Kozlowski, Hans Verkuil, Abhinav Kumar,
linux-arm-msm, Hans Verkuil, linux-kernel, Krzysztof Kozlowski,
devicetree
On Fri, 27 Feb 2026 19:41:17 +0530, Vikash Garodia wrote:
> Kaanapali SOC brings in the new generation of video IP i.e iris4. When
> compared to previous generation, iris3x, it has,
> - separate power domains for stream and pixel processing hardware blocks
> (bse and vpp).
> - additional power domain for apv codec.
> - power domains for individual pipes (VPPx).
> - different clocks and reset lines.
>
> iommu-map include all the different stream-ids which can be possibly
> generated by vpu4 hardware as below,
> bitstream stream from vcodec
> non-pixel stream from vcodec
> non-pixel stream from tensilica
> pixel stream from vcodec
> secure bitstream stream from vcodec
> secure non-pixel stream from vcodec
> secure non-pixel stream from tensilica
> secure pixel stream from vcodec
> firmware stream from tensilica (might be handled by the TZ / hyp)
>
> This patch is depend on the below dt-schema patch.
> Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
> include/dt-bindings/media/qcom,iris.h | 18 ++
> 2 files changed, 279 insertions(+)
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdm845.example.dtb: pcie@1c00000 (qcom,pcie-sdm845): iommu-map:0: [0, 4294967295, 7184, 1, 256, 4294967295, 7185, 1, 512, 4294967295, 7186, 1, 768, 4294967295, 7187, 1, 1024, 4294967295, 7188, 1, 1280, 4294967295, 7189, 1, 1536, 4294967295, 7190, 1, 1792, 4294967295, 7191, 1, 2048, 4294967295, 7192, 1, 2304, 4294967295, 7193, 1, 2560, 4294967295, 7194, 1, 2816, 4294967295, 7195, 1, 3072, 4294967295, 7196, 1, 3328, 4294967295, 7197, 1, 3584, 4294967295, 7198, 1, 3840, 4294967295, 7199, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdm845.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdm845.example.dtb: pcie@1c00000 (qcom,pcie-sdm845): Unevaluated properties are not allowed ('#address-cells', '#interrupt-cells', '#size-cells', 'bus-range', 'device_type', 'interrupt-map', 'interrupt-map-mask', 'iommu-map', 'linux,pci-domain', 'num-lanes', 'pcie@0', 'perst-gpios', 'phy-names', 'phys', 'power-domains', 'ranges', 'vddpe-3v3-supply', 'wake-gpios' were unexpected)
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdm845.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdm845.example.dtb: pcie@1c00000 (qcom,pcie-sdm845): iommu-map:0: [0, 4294967295, 7184, 1, 256, 4294967295, 7185, 1, 512, 4294967295, 7186, 1, 768, 4294967295, 7187, 1, 1024, 4294967295, 7188, 1, 1280, 4294967295, 7189, 1, 1536, 4294967295, 7190, 1, 1792, 4294967295, 7191, 1, 2048, 4294967295, 7192, 1, 2304, 4294967295, 7193, 1, 2560, 4294967295, 7194, 1, 2816, 4294967295, 7195, 1, 3072, 4294967295, 7196, 1, 3328, 4294967295, 7197, 1, 3584, 4294967295, 7198, 1, 3840, 4294967295, 7199, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:0: [0, 4294967295, 512, 1, 256] is too long
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:1:0: 4294967295 is greater than the maximum of 65535
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:1: [4294967295, 513, 1, 512, 4294967295] is too long
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:2:3: 4294967295 is greater than the maximum of 65536
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:2: [514, 1, 768, 4294967295, 515] is too long
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:3: [1, 1024, 4294967295, 516, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): Unevaluated properties are not allowed ('#address-cells', '#interrupt-cells', '#size-cells', 'bus-range', 'device_type', 'interrupt-map', 'interrupt-map-mask', 'iommu-map', 'linux,pci-domain', 'num-lanes', 'pcie@0', 'perst-gpios', 'phy-names', 'phys', 'power-domains', 'ranges', 'wake-gpios' were unexpected)
from schema $id: http://devicetree.org/schemas/pci/qcom,pcie-sdx55.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:0: [0, 4294967295, 512, 1, 256] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:1:0: 4294967295 is greater than the maximum of 65535
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:1: [4294967295, 513, 1, 512, 4294967295] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:2:3: 4294967295 is greater than the maximum of 65536
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:2: [514, 1, 768, 4294967295, 515] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.example.dtb: pcie@1c00000 (qcom,pcie-sdx55): iommu-map:3: [1, 1024, 4294967295, 516, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:0: [256, 4294967295, 6468, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:1: [257, 4294967295, 6464, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:2: [257, 4294967295, 6688, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:3: [258, 4294967295, 6467, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:4: [512, 4294967295, 6470, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:5: [513, 4294967295, 6465, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:6: [513, 4294967295, 6689, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:7: [514, 4294967295, 6469, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.example.dtb: video-codec@2000000 (qcom,kaanapali-iris): iommu-map:8: [768, 4294967295, 6690, 0, 1] is too long
from schema $id: http://devicetree.org/schemas/pci/pci-iommu.yaml
doc reference errors (make refcheckdocs):
See https://patchwork.kernel.org/project/devicetree/patch/20260227-kaanapali-iris-v2-1-850043ac3933@oss.qualcomm.com
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 0/7] media: iris: add support for kaanapali platform
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
` (6 preceding siblings ...)
2026-02-27 14:11 ` [PATCH v2 7/7] media: iris: add platform data for kaanapali Vikash Garodia
@ 2026-02-27 15:42 ` Bryan O'Donoghue
7 siblings, 0 replies; 47+ messages in thread
From: Bryan O'Donoghue @ 2026-02-27 15:42 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Krzysztof Kozlowski, Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu
On 27/02/2026 14:11, Vikash Garodia wrote:
> Qualcomm kaanapali platform have a newer generation of video IP iris4.
> The hardware have evolved mostly with respect to higher number of power
> domains as well as multiple clock sources.
>
> Considering iris as a client driver, it adds the handling for multiple
> stream ids from VPU via iommu-map.
>
> This series is depend on the below series:
> https://lore.kernel.org/all/20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com/
>
> Following patches were dropped in v2, as per the comments, and would
> be posted separately. This series depends on these patches for
> functionality.
> - https://lore.kernel.org/all/20260126-kaanapali-iris-v1-2-e2646246bfc1@oss.qualcomm.com/
> - https://lore.kernel.org/all/20260126-kaanapali-iris-v1-3-e2646246bfc1@oss.qualcomm.com/
>
> Patch #4 is also posted alongwith below series. If the other series is
> picked earlier, then this patch can be dropped from this series.
> https://lore.kernel.org/all/20260227-iris_sc7280_gen2_support-v2-1-7e5b13d26542@oss.qualcomm.com/
For the record this series is blocked on this:
https://lore.kernel.org/all/20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com/
---
bod
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 7/7] media: iris: add platform data for kaanapali
2026-02-27 14:11 ` [PATCH v2 7/7] media: iris: add platform data for kaanapali Vikash Garodia
@ 2026-02-27 15:48 ` Krzysztof Kozlowski
2026-02-28 7:31 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Krzysztof Kozlowski @ 2026-02-27 15:48 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 27/02/2026 15:11, Vikash Garodia wrote:
> +
> +#include <dt-bindings/media/qcom,iris.h>
> +
> +#define VIDEO_REGION_VM0_SECURE_NP_ID 1
> +#define VIDEO_REGION_VM0_NONSECURE_NP_ID 5
> +
> +static const char *const kaanapali_clk_reset_table[] = {
> + "bus0",
> + "bus1",
> + "core",
> + "vcodec0_core",
> +};
How many copies do you want of this? Data definition never goes to
headers. That's standard C rules.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses
2026-02-27 14:11 ` [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses Vikash Garodia
@ 2026-02-27 15:49 ` Krzysztof Kozlowski
2026-03-03 18:26 ` Vikash Garodia
2026-02-27 20:14 ` Dmitry Baryshkov
1 sibling, 1 reply; 47+ messages in thread
From: Krzysztof Kozlowski @ 2026-02-27 15:49 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 27/02/2026 15:11, Vikash Garodia wrote:
> Add iris vpu bus support and hooks the new bus into the iommu_buses
> list. Iris devices need their own bus so that each iris device can run
> its own dma_configure() logic.
>
> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> drivers/iommu/iommu.c | 4 ++++
> drivers/media/platform/qcom/iris/Makefile | 4 ++++
> drivers/media/platform/qcom/iris/iris_vpu_bus.c | 32 +++++++++++++++++++++++++
> include/linux/iris_vpu_bus.h | 13 ++++++++++
> 4 files changed, 53 insertions(+)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 35db5178095404fec87cd0f18e44ea97cf354e78..fd5fb7c10da22ab548d359ca1f44504acc3d646c 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -13,6 +13,7 @@
> #include <linux/bug.h>
> #include <linux/types.h>
> #include <linux/init.h>
> +#include <linux/iris_vpu_bus.h>
> #include <linux/export.h>
> #include <linux/slab.h>
> #include <linux/errno.h>
> @@ -178,6 +179,9 @@ static const struct bus_type * const iommu_buses[] = {
> #ifdef CONFIG_CDX_BUS
> &cdx_bus_type,
> #endif
> +#if IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)
> + &iris_vpu_bus_type,
> +#endif
> };
>
> /*
> diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
> index 2abbd3aeb4af07e52bf372a4b2f352463529c92c..6f4052b98491aeddc299669334d4c93e9a3420e4 100644
> --- a/drivers/media/platform/qcom/iris/Makefile
> +++ b/drivers/media/platform/qcom/iris/Makefile
> @@ -31,3 +31,7 @@ qcom-iris-objs += iris_platform_gen1.o
> endif
>
> obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o
> +
> +ifdef CONFIG_VIDEO_QCOM_IRIS
> +obj-y += iris_vpu_bus.o
> +endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_bus.c b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..34ce78d9b0ff1feda15ba4f060a56d02749a0858
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
> @@ -0,0 +1,32 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#include <linux/device.h>
> +#include <linux/of_device.h>
> +
> +#include "iris_platform_common.h"
> +
> +static int iris_vpu_bus_dma_configure(struct device *dev)
> +{
> + struct iris_context_bank *cb = dev_get_drvdata(dev);
> +
> + if (!cb)
> + return -ENODEV;
> +
> + return of_dma_configure_id(dev, dev->parent->of_node, true, &cb->f_id);
Apply this patch and build it. Does it build?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
2026-02-27 15:42 ` Rob Herring (Arm)
@ 2026-02-27 15:50 ` Krzysztof Kozlowski
2026-02-27 15:55 ` Krzysztof Kozlowski
2026-03-03 18:10 ` Vikash Garodia
2026-02-27 19:52 ` Dmitry Baryshkov
2 siblings, 2 replies; 47+ messages in thread
From: Krzysztof Kozlowski @ 2026-02-27 15:50 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 27/02/2026 15:11, Vikash Garodia wrote:
> Kaanapali SOC brings in the new generation of video IP i.e iris4. When
> compared to previous generation, iris3x, it has,
> - separate power domains for stream and pixel processing hardware blocks
> (bse and vpp).
> - additional power domain for apv codec.
> - power domains for individual pipes (VPPx).
> - different clocks and reset lines.
>
> iommu-map include all the different stream-ids which can be possibly
> generated by vpu4 hardware as below,
> bitstream stream from vcodec
> non-pixel stream from vcodec
> non-pixel stream from tensilica
> pixel stream from vcodec
> secure bitstream stream from vcodec
> secure non-pixel stream from vcodec
> secure non-pixel stream from tensilica
> secure pixel stream from vcodec
> firmware stream from tensilica (might be handled by the TZ / hyp)
I cannot really parse above.
>
> This patch is depend on the below dt-schema patch.
> Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
> include/dt-bindings/media/qcom,iris.h | 18 ++
> 2 files changed, 279 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml b/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml
> new file mode 100644
> index 0000000000000000000000000000000000000000..db734c664a0417d8f5ea55b066f63f42583b1c14
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml
> @@ -0,0 +1,261 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/media/qcom,kaanapali-iris.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm Kaanapali Iris video encoder and decoder
> +
> +maintainers:
> + - Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> + - Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
> +
> +description:
> + The iris video processing unit is a video encode and decode accelerator
> + present on Qualcomm Kaanapali SoC.
> +
> +definitions:
> + iommu-types:
> + items:
> + - description: Function ID
> + - description: Phandle to IOMMU
> + - description: IOMMU stream ID base
> + - description: IOMMU stream ID mask
> + - description: Number of stream IDs
You don't need definitions.
> +
> +properties:
> + compatible:
> + const: qcom,kaanapali-iris
> +
> + reg:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 10
> +
> + clock-names:
> + items:
> + - const: iface
> + - const: core
> + - const: vcodec0_core
> + - const: iface1
> + - const: core_freerun
> + - const: vcodec0_core_freerun
> + - const: vcodec_bse
> + - const: vcodec_vpp0
> + - const: vcodec_vpp1
> + - const: vcodec_apv
> +
> + dma-coherent: true
> +
> + firmware-name:
> + maxItems: 1
> +
> + interconnects:
> + maxItems: 2
> +
> + interconnect-names:
> + items:
> + - const: cpu-cfg
> + - const: video-mem
> +
> + interrupts:
> + maxItems: 1
> +
> + iommu-map:
> + description: |
> + - bitstream stream from vcodec
> + - non-pixel stream from vcodec
> + - non-pixel stream from tensilica
> + - pixel stream from vcodec
> + - secure bitstream stream from vcodec
> + - secure non-pixel stream from vcodec
> + - secure non-pixel stream from tensilica
> + - secure pixel stream from vcodec
> + # firmware might be handled by the TZ / hyp
> + - firmware stream from tensilica
Drop description, pointless. How does it help anyhow in writing DTS?
> + $ref: /schemas/types.yaml#/definitions/uint32-matrix
> + items:
> + $ref: '#/definitions/iommu-types'
> + minItems: 5
> + minItems: 8
> + maxItems: 9
This solves nothing from the discussions we had. I re-iterated multiple
times, plus there were internal threads doing the same, that you need to
define the items to have strict order.
> +
> + memory-region:
> + maxItems: 1
> +
> + operating-points-v2: true
> + opp-table:
> + type: object
> +
> + power-domains:
> + maxItems: 7
> +
> + power-domain-names:
> + items:
> + - const: venus
> + - const: vcodec0
> + - const: mxc
> + - const: mmcx
> + - const: vpp0
> + - const: vpp1
> + - const: apv
> +
> + resets:
> + maxItems: 4
> +
> + reset-names:
> + items:
> + - const: bus0
> + - const: bus1
> + - const: core
> + - const: vcodec0_core
> +
I assume you checked and used last SoC order of all the entries here.
> +required:
> + - compatible
> + - reg
> + - clocks
> + - clock-names
> + - dma-coherent
> + - interconnects
> + - interconnect-names
> + - interrupts
> + - iommu-map
> + - memory-region
> + - power-domains
> + - power-domain-names
> + - resets
> + - reset-names
> +
> +unevaluatedProperties: false
additionalprops, see writing schema for explanation.
...
> + };
> diff --git a/include/dt-bindings/media/qcom,iris.h b/include/dt-bindings/media/qcom,iris.h
Filename must match binding/compatible. I asked for this multiple times.
> new file mode 100644
> index 0000000000000000000000000000000000000000..beb244289466ca938c7e5fe5cf15526f606a3a6c
> --- /dev/null
> +++ b/include/dt-bindings/media/qcom,iris.h
> @@ -0,0 +1,18 @@
> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
> +/*
> + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
> + */
> +
> +#ifndef _DT_BINDINGS_MEDIA_QCOM_IRIS_H
> +#define _DT_BINDINGS_MEDIA_QCOM_IRIS_H
> +
> +/* Function identifiers for iommu-map to attach for the context bank devices */
> +#define IRIS_BITSTREAM 0x100
> +#define IRIS_NON_PIXEL 0x101
> +#define IRIS_PIXEL 0x102
> +#define IRIS_SECURE_BITSTREAM 0x200
> +#define IRIS_SECURE_NON_PIXEL 0x201
> +#define IRIS_SECURE_PIXEL 0x202
> +#define IRIS_FIRMWARE 0x300
> +
Abstract identifiers for ABI start with 0 or 1 and are incremented by 1,
not 0x100. There are also decimal, not hex.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 15:50 ` Krzysztof Kozlowski
@ 2026-02-27 15:55 ` Krzysztof Kozlowski
2026-03-03 18:10 ` Vikash Garodia
1 sibling, 0 replies; 47+ messages in thread
From: Krzysztof Kozlowski @ 2026-02-27 15:55 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 27/02/2026 16:50, Krzysztof Kozlowski wrote:
> On 27/02/2026 15:11, Vikash Garodia wrote:
>> +
>> +maintainers:
>> + - Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> + - Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
>> +
>> +description:
>> + The iris video processing unit is a video encode and decode accelerator
>> + present on Qualcomm Kaanapali SoC.
>> +
>> +definitions:
>> + iommu-types:
>> + items:
>> + - description: Function ID
>> + - description: Phandle to IOMMU
>> + - description: IOMMU stream ID base
>> + - description: IOMMU stream ID mask
>> + - description: Number of stream IDs
>
> You don't need definitions.
Although when iommu-map is properly written listing items, then it would
use that. Anyway, we don't use definitions but defs (see git grep).
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot
2026-02-27 14:11 ` [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot Vikash Garodia
@ 2026-02-27 16:49 ` Konrad Dybcio
2026-03-03 18:15 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Konrad Dybcio @ 2026-02-27 16:49 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Krzysztof Kozlowski, Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 2/27/26 3:11 PM, Vikash Garodia wrote:
> Currently the driver switches the vcodec GDSC to hardware (HW) mode
> before firmware load and boot sequence. GDSC can be powered off, keeping
> in hw mode, thereby the vcodec registers programmed in TrustZone (TZ)
> carry default (reset) values.
> Move the transition to HW mode after firmware load and boot sequence.
>
> The bug was exposed with driver configuring different stream ids to
> different devices via iommu-map. With registers carrying reset values,
> VPU would not generate desired stream-id, thereby leading to SMMU fault.
>
> For vpu4, when GDSC is switched to HW mode, there is a need to perform
> the reset operation. Without reset, there are occassional issues of
> register corruption observed. Hence the vpu GDSC switch also involves
> the reset.
Is that a characteristic of the hardware (e.g. also seen downstream), or
is that required with upstream iris only?
Konrad
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
2026-02-27 15:42 ` Rob Herring (Arm)
2026-02-27 15:50 ` Krzysztof Kozlowski
@ 2026-02-27 19:52 ` Dmitry Baryshkov
2026-03-03 18:13 ` Vikash Garodia
2 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-02-27 19:52 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Feb 27, 2026 at 07:41:17PM +0530, Vikash Garodia wrote:
> Kaanapali SOC brings in the new generation of video IP i.e iris4. When
> compared to previous generation, iris3x, it has,
> - separate power domains for stream and pixel processing hardware blocks
> (bse and vpp).
> - additional power domain for apv codec.
> - power domains for individual pipes (VPPx).
> - different clocks and reset lines.
>
> iommu-map include all the different stream-ids which can be possibly
> generated by vpu4 hardware as below,
> bitstream stream from vcodec
> non-pixel stream from vcodec
> non-pixel stream from tensilica
> pixel stream from vcodec
> secure bitstream stream from vcodec
> secure non-pixel stream from vcodec
> secure non-pixel stream from tensilica
> secure pixel stream from vcodec
> firmware stream from tensilica (might be handled by the TZ / hyp)
>
> This patch is depend on the below dt-schema patch.
> Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
> include/dt-bindings/media/qcom,iris.h | 18 ++
> 2 files changed, 279 insertions(+)
>
> +
> + iommu-map:
> + description: |
> + - bitstream stream from vcodec
> + - non-pixel stream from vcodec
> + - non-pixel stream from tensilica
> + - pixel stream from vcodec
> + - secure bitstream stream from vcodec
> + - secure non-pixel stream from vcodec
> + - secure non-pixel stream from tensilica
> + - secure pixel stream from vcodec
> + # firmware might be handled by the TZ / hyp
> + - firmware stream from tensilica
Why are you providing description as a list rather than describing each
item separately? Then you wouldn't need maxItems.
> + $ref: /schemas/types.yaml#/definitions/uint32-matrix
> + items:
> + $ref: '#/definitions/iommu-types'
> + minItems: 5
> + minItems: 8
> + maxItems: 9
> +
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses
2026-02-27 14:11 ` [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses Vikash Garodia
2026-02-27 15:49 ` Krzysztof Kozlowski
@ 2026-02-27 20:14 ` Dmitry Baryshkov
1 sibling, 0 replies; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-02-27 20:14 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Feb 27, 2026 at 07:41:19PM +0530, Vikash Garodia wrote:
> Add iris vpu bus support and hooks the new bus into the iommu_buses
> list. Iris devices need their own bus so that each iris device can run
> its own dma_configure() logic.
What are "Iris devices"? Are there multiple en/decoders in an SoC?
>
> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> drivers/iommu/iommu.c | 4 ++++
> drivers/media/platform/qcom/iris/Makefile | 4 ++++
> drivers/media/platform/qcom/iris/iris_vpu_bus.c | 32 +++++++++++++++++++++++++
> include/linux/iris_vpu_bus.h | 13 ++++++++++
> 4 files changed, 53 insertions(+)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 35db5178095404fec87cd0f18e44ea97cf354e78..fd5fb7c10da22ab548d359ca1f44504acc3d646c 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -13,6 +13,7 @@
> #include <linux/bug.h>
> #include <linux/types.h>
> #include <linux/init.h>
> +#include <linux/iris_vpu_bus.h>
> #include <linux/export.h>
> #include <linux/slab.h>
> #include <linux/errno.h>
> @@ -178,6 +179,9 @@ static const struct bus_type * const iommu_buses[] = {
> #ifdef CONFIG_CDX_BUS
> &cdx_bus_type,
> #endif
> +#if IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)
> + &iris_vpu_bus_type,
> +#endif
> };
>
> /*
> diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
> index 2abbd3aeb4af07e52bf372a4b2f352463529c92c..6f4052b98491aeddc299669334d4c93e9a3420e4 100644
> --- a/drivers/media/platform/qcom/iris/Makefile
> +++ b/drivers/media/platform/qcom/iris/Makefile
> @@ -31,3 +31,7 @@ qcom-iris-objs += iris_platform_gen1.o
> endif
>
> obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o
> +
> +ifdef CONFIG_VIDEO_QCOM_IRIS
> +obj-y += iris_vpu_bus.o
> +endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_bus.c b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..34ce78d9b0ff1feda15ba4f060a56d02749a0858
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
> @@ -0,0 +1,32 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
Drop the year.
> + */
> +
> +#include <linux/device.h>
> +#include <linux/of_device.h>
> +
> +#include "iris_platform_common.h"
> +
> +static int iris_vpu_bus_dma_configure(struct device *dev)
> +{
> + struct iris_context_bank *cb = dev_get_drvdata(dev);
> +
> + if (!cb)
> + return -ENODEV;
> +
> + return of_dma_configure_id(dev, dev->parent->of_node, true, &cb->f_id);
> +}
> +
> +const struct bus_type iris_vpu_bus_type = {
> + .name = "iris-bus",
> + .dma_configure = iris_vpu_bus_dma_configure,
> +};
> +EXPORT_SYMBOL_GPL(iris_vpu_bus_type);
> +
> +static int __init iris_vpu_bus_init(void)
> +{
> + return bus_register(&iris_vpu_bus_type);
Together with the Host1x it's the third bus having exactly the same
functionality that I've seen in the last several days (I counted the
FastRPC one). Could you please generalize Tegra code and come up with
the single bug that will work for all simple users?
> +}
> +
> +postcore_initcall(iris_vpu_bus_init);
> diff --git a/include/linux/iris_vpu_bus.h b/include/linux/iris_vpu_bus.h
> new file mode 100644
> index 0000000000000000000000000000000000000000..8aba472fcadd269e196b7243da5660deaff31abb
> --- /dev/null
> +++ b/include/linux/iris_vpu_bus.h
> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: GPL-2.0-only
> + *
> + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef __IRIS_VPU_BUS_H__
> +#define __IRIS_VPU_BUS_H__
> +
> +#if IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)
> +extern const struct bus_type iris_vpu_bus_type;
> +#endif
> +
> +#endif /* __IRIS_VPU_BUS_H__ */
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-02-27 14:11 ` [PATCH v2 4/7] media: iris: add context bank devices using iommu-map Vikash Garodia
@ 2026-02-27 20:20 ` Dmitry Baryshkov
2026-03-03 18:46 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-02-27 20:20 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
> Introduce different context banks(CB) and the associated buffer region.
> Different stream IDs from VPU would be associated to one of these CB.
> Multiple CBs are needed to increase the IOVA for the video usecases like
> higher concurrent sessions.
>
> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
> drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
> drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
> drivers/media/platform/qcom/iris/iris_resources.h | 1 +
> 4 files changed, 111 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -204,6 +204,22 @@ struct icc_vote_data {
> u32 fps;
> };
>
> +enum iris_buffer_region {
> + IRIS_BITSTREAM_REGION = BIT(0),
> + IRIS_NON_PIXEL_REGION = BIT(1),
> + IRIS_PIXEL_REGION = BIT(2),
> + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
> + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
> + IRIS_SECURE_PIXEL_REGION = BIT(5),
Can a context bank belong to multiple regions at the same time?
> +};
> +
> +struct iris_context_bank {
> + struct device *dev;
Separate data and the actual device. Define a wrapper around struct
device for the actual runtime usage.
> + const char *name;
> + const u32 f_id;
> + const enum iris_buffer_region region;
> +};
> +
> enum platform_pm_domain_type {
> IRIS_CTRL_POWER_DOMAIN,
> IRIS_HW_POWER_DOMAIN,
> @@ -246,6 +262,8 @@ struct iris_platform_data {
> u32 inst_fw_caps_enc_size;
> const struct tz_cp_config *tz_cp_config_data;
> u32 tz_cp_config_data_size;
> + struct iris_context_bank *cb_data;
> + u32 cb_data_size;
Do they differ from platform to platform? Mark them as const, it should
be data only.
> u32 core_arch;
> u32 hw_response_timeout;
> struct ubwc_config_data *ubwc_config;
> diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
> index ddaacda523ecb9990af0dd0640196223fbcc2cab..557adb038328a75510591d91569819abc0b7b1c9 100644
> --- a/drivers/media/platform/qcom/iris/iris_probe.c
> +++ b/drivers/media/platform/qcom/iris/iris_probe.c
> @@ -123,6 +123,49 @@ static int iris_init_resets(struct iris_core *core)
> core->iris_platform_data->controller_rst_tbl_size);
> }
>
> +static void iris_destroy_child_device(struct iris_context_bank *cb)
> +{
> + struct device *dev = cb->dev;
> +
> + if (dev)
> + device_unregister(dev);
> +
> + cb->dev = NULL;
> +}
> +
> +static void iris_deinit_context_bank_devices(struct iris_core *core)
> +{
> + struct iris_context_bank *cb;
> + int i;
> +
> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> + cb = &core->iris_platform_data->cb_data[i];
> + iris_destroy_child_device(cb);
> + }
> +}
> +
> +static int iris_init_context_bank_devices(struct iris_core *core)
> +{
> + struct iris_context_bank *cb;
> + int ret, i;
> +
> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> + cb = &core->iris_platform_data->cb_data[i];
> +
> + ret = iris_create_child_device_and_map(core, cb);
> + if (ret)
> + goto err_deinit_cb;
> + }
> +
> + return 0;
> +
> +err_deinit_cb:
> + while (i-- > 0)
> + iris_destroy_child_device(&core->iris_platform_data->cb_data[i]);
> +
> + return ret;
> +}
> +
> static int iris_init_resources(struct iris_core *core)
> {
> int ret;
> @@ -193,6 +236,7 @@ static void iris_remove(struct platform_device *pdev)
> return;
>
> iris_core_deinit(core);
> + iris_deinit_context_bank_devices(core);
>
> video_unregister_device(core->vdev_dec);
> video_unregister_device(core->vdev_enc);
> @@ -275,12 +319,18 @@ static int iris_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, core);
>
> - dma_mask = core->iris_platform_data->dma_mask;
> -
> - ret = dma_set_mask_and_coherent(dev, dma_mask);
> + ret = iris_init_context_bank_devices(core);
> if (ret)
> goto err_vdev_unreg_enc;
>
> + dma_mask = core->iris_platform_data->dma_mask;
> +
> + if (device_iommu_mapped(core->dev)) {
> + ret = dma_set_mask_and_coherent(core->dev, dma_mask);
> + if (ret)
> + goto err_deinit_cb;
> + }
> +
> dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
> dma_set_seg_boundary(&pdev->dev, DMA_BIT_MASK(32));
>
> @@ -288,10 +338,12 @@ static int iris_probe(struct platform_device *pdev)
> pm_runtime_use_autosuspend(core->dev);
> ret = devm_pm_runtime_enable(core->dev);
> if (ret)
> - goto err_vdev_unreg_enc;
> + goto err_deinit_cb;
>
> return 0;
>
> +err_deinit_cb:
> + iris_deinit_context_bank_devices(core);
> err_vdev_unreg_enc:
> video_unregister_device(core->vdev_enc);
> err_vdev_unreg_dec:
> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
> index 773f6548370a257b8ae7332242544266cbbd61a9..be58e8620086d0f82c2c2bda29247483f5c56d79 100644
> --- a/drivers/media/platform/qcom/iris/iris_resources.c
> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
> @@ -6,6 +6,7 @@
> #include <linux/clk.h>
> #include <linux/devfreq.h>
> #include <linux/interconnect.h>
> +#include <linux/iris_vpu_bus.h>
> #include <linux/pm_domain.h>
> #include <linux/pm_opp.h>
> #include <linux/pm_runtime.h>
> @@ -141,3 +142,38 @@ int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type
>
> return 0;
> }
> +
> +static void iris_device_release(struct device *dev)
> +{
> + dev_set_drvdata(dev, NULL);
> + kfree(dev);
> +}
> +
> +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb)
> +{
> + struct device *dev;
> + int ret;
> +
> + dev = kzalloc_obj(*dev);
> + if (!dev)
> + return -ENOMEM;
> +
> + dev->release = iris_device_release;
> + dev->bus = &iris_vpu_bus_type;
> + dev->parent = core->dev;
> + dev->coherent_dma_mask = core->iris_platform_data->dma_mask;
> + dev->dma_mask = &dev->coherent_dma_mask;
> +
> + dev_set_name(dev, "%s", cb->name);
> + dev_set_drvdata(dev, cb);
> +
> + ret = device_register(dev);
> + if (ret) {
> + put_device(dev);
> + return ret;
> + }
> +
> + cb->dev = dev;
> +
> + return 0;
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
> index 6bfbd2dc6db095ec05e53c894e048285f82446c6..b7efe15facb203eea9ae13d5f0abdcc2ea718b4d 100644
> --- a/drivers/media/platform/qcom/iris/iris_resources.h
> +++ b/drivers/media/platform/qcom/iris/iris_resources.h
> @@ -15,5 +15,6 @@ int iris_unset_icc_bw(struct iris_core *core);
> int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
> int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
> int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
> +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
>
> #endif
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 5/7] media: iris: add helper to select context bank device
2026-02-27 14:11 ` [PATCH v2 5/7] media: iris: add helper to select context bank device Vikash Garodia
@ 2026-02-27 20:27 ` Dmitry Baryshkov
2026-03-03 19:16 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-02-27 20:27 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Feb 27, 2026 at 07:41:21PM +0530, Vikash Garodia wrote:
> Depending on the buffer type (input, output, internal and interface
> queues), associated context bank is selected, if available. Fallback to
> parent device for backward compatibility.
>
> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_buffer.c | 7 +--
> drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
> drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++---
> drivers/media/platform/qcom/iris/iris_resources.c | 60 +++++++++++++++++++++++
> drivers/media/platform/qcom/iris/iris_resources.h | 2 +
> drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
> 6 files changed, 79 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
> index 9151f43bc6b9c2c34c803de4231d1e6de0bec6c4..95962c19c334f08a74c5b7e8ba978ab631a65e9c 100644
> --- a/drivers/media/platform/qcom/iris/iris_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_buffer.c
> @@ -335,8 +335,8 @@ void iris_get_internal_buffers(struct iris_inst *inst, u32 plane)
> static int iris_create_internal_buffer(struct iris_inst *inst,
> enum iris_buffer_type buffer_type, u32 index)
> {
> + struct device *dev = iris_get_cb_dev(inst->core, inst, buffer_type);
> struct iris_buffers *buffers = &inst->buffers[buffer_type];
> - struct iris_core *core = inst->core;
> struct iris_buffer *buffer;
>
> if (!buffers->size)
> @@ -352,7 +352,7 @@ static int iris_create_internal_buffer(struct iris_inst *inst,
> buffer->buffer_size = buffers->size;
> buffer->dma_attrs = DMA_ATTR_WRITE_COMBINE | DMA_ATTR_NO_KERNEL_MAPPING;
>
> - buffer->kvaddr = dma_alloc_attrs(core->dev, buffer->buffer_size,
> + buffer->kvaddr = dma_alloc_attrs(dev, buffer->buffer_size,
> &buffer->device_addr, GFP_KERNEL, buffer->dma_attrs);
> if (!buffer->kvaddr) {
> kfree(buffer);
> @@ -490,9 +490,10 @@ int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane)
> int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buffer)
> {
> struct iris_core *core = inst->core;
> + struct device *dev = iris_get_cb_dev(core, inst, buffer->type);
>
> list_del(&buffer->list);
> - dma_free_attrs(core->dev, buffer->buffer_size, buffer->kvaddr,
> + dma_free_attrs(dev, buffer->buffer_size, buffer->kvaddr,
> buffer->device_addr, buffer->dma_attrs);
> kfree(buffer);
>
> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h
> index 75bb767761824c4c02e0df9b765896cc093be333..9520aa290b44f06ed2004ad89940c19d1c08a3d2 100644
> --- a/drivers/media/platform/qcom/iris/iris_buffer.h
> +++ b/drivers/media/platform/qcom/iris/iris_buffer.h
> @@ -28,6 +28,7 @@ struct iris_inst;
> * @BUF_SCRATCH_2: buffer to store encoding context data for HW
> * @BUF_VPSS: buffer to store VPSS context data for HW
> * @BUF_PARTIAL: buffer for AV1 IBC data
> + * @BUF_HFI_QUEUE: buffer for hardware firmware interface queue
Separate commit?
> * @BUF_TYPE_MAX: max buffer types
> */
> enum iris_buffer_type {
> @@ -44,6 +45,7 @@ enum iris_buffer_type {
> BUF_SCRATCH_2,
> BUF_VPSS,
> BUF_PARTIAL,
> + BUF_HFI_QUEUE,
> BUF_TYPE_MAX,
> };
>
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_queue.c b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
> index b3ed06297953b902d5ea6c452385a88d5431ac66..c1241fb8dc6519020a063cbba87aed665701d7ae 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_queue.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
> @@ -245,25 +245,26 @@ static void iris_hfi_queue_deinit(struct iris_iface_q_info *iface_q)
>
> int iris_hfi_queues_init(struct iris_core *core)
> {
> + struct device *dev = iris_get_cb_dev(core, NULL, BUF_HFI_QUEUE);
> struct iris_hfi_queue_table_header *q_tbl_hdr;
> u32 queue_size;
>
> /* Iris hardware requires 4K queue alignment */
> queue_size = ALIGN((sizeof(*q_tbl_hdr) + (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ)), SZ_4K);
> - core->iface_q_table_vaddr = dma_alloc_attrs(core->dev, queue_size,
> + core->iface_q_table_vaddr = dma_alloc_attrs(dev, queue_size,
> &core->iface_q_table_daddr,
> GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
> if (!core->iface_q_table_vaddr) {
> - dev_err(core->dev, "queues alloc and map failed\n");
> + dev_err(dev, "queues alloc and map failed\n");
> return -ENOMEM;
> }
>
> - core->sfr_vaddr = dma_alloc_attrs(core->dev, SFR_SIZE,
> + core->sfr_vaddr = dma_alloc_attrs(dev, SFR_SIZE,
> &core->sfr_daddr,
> GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
> if (!core->sfr_vaddr) {
> - dev_err(core->dev, "sfr alloc and map failed\n");
> - dma_free_attrs(core->dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr,
> + dev_err(dev, "sfr alloc and map failed\n");
> + dma_free_attrs(dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr,
> core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
> return -ENOMEM;
> }
> @@ -291,6 +292,7 @@ int iris_hfi_queues_init(struct iris_core *core)
>
> void iris_hfi_queues_deinit(struct iris_core *core)
> {
> + struct device *dev = iris_get_cb_dev(core, NULL, BUF_HFI_QUEUE);
> u32 queue_size;
>
> if (!core->iface_q_table_vaddr)
> @@ -300,7 +302,7 @@ void iris_hfi_queues_deinit(struct iris_core *core)
> iris_hfi_queue_deinit(&core->message_queue);
> iris_hfi_queue_deinit(&core->command_queue);
>
> - dma_free_attrs(core->dev, SFR_SIZE, core->sfr_vaddr,
> + dma_free_attrs(dev, SFR_SIZE, core->sfr_vaddr,
> core->sfr_daddr, DMA_ATTR_WRITE_COMBINE);
>
> core->sfr_vaddr = NULL;
> @@ -309,7 +311,7 @@ void iris_hfi_queues_deinit(struct iris_core *core)
> queue_size = ALIGN(sizeof(struct iris_hfi_queue_table_header) +
> (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ), SZ_4K);
>
> - dma_free_attrs(core->dev, queue_size, core->iface_q_table_vaddr,
> + dma_free_attrs(dev, queue_size, core->iface_q_table_vaddr,
> core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
>
> core->iface_q_table_vaddr = NULL;
> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
> index be58e8620086d0f82c2c2bda29247483f5c56d79..65544cb0fa8fc4b250b0a0be1bb900d74b999d35 100644
> --- a/drivers/media/platform/qcom/iris/iris_resources.c
> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
> @@ -13,6 +13,7 @@
> #include <linux/reset.h>
>
> #include "iris_core.h"
> +#include "iris_instance.h"
> #include "iris_resources.h"
>
> #define BW_THRESHOLD 50000
> @@ -177,3 +178,62 @@ int iris_create_child_device_and_map(struct iris_core *core, struct iris_context
>
> return 0;
> }
> +
> +static enum iris_buffer_region iris_get_region(struct iris_inst *inst,
> + enum iris_buffer_type buffer_type)
> +{
> + switch (buffer_type) {
> + case BUF_INPUT:
> + if (inst && inst->domain == ENCODER)
Can inst be NULL here?
> + return IRIS_PIXEL_REGION;
> + else if (inst && inst->domain == DECODER)
> + return IRIS_BITSTREAM_REGION;
Are there any other possibilities than encoder and decoder?
> + break;
> + case BUF_OUTPUT:
> + if (inst && inst->domain == ENCODER)
> + return IRIS_BITSTREAM_REGION;
> + else if (inst && inst->domain == DECODER)
> + return IRIS_PIXEL_REGION;
> + break;
> + case BUF_BIN:
> + return IRIS_BITSTREAM_REGION;
> + case BUF_DPB:
> + case BUF_PARTIAL:
> + case BUF_SCRATCH_2:
> + case BUF_VPSS:
> + return IRIS_PIXEL_REGION;
> + case BUF_ARP:
> + case BUF_COMV:
> + case BUF_HFI_QUEUE:
> + case BUF_LINE:
> + case BUF_NON_COMV:
> + case BUF_PERSIST:
> + return IRIS_NON_PIXEL_REGION;
> + default:
> + return 0;
dev_err(dev, "unsupported buffer type %x\n", buffer_type)
return -EINVAL;
> + }
> +
> + return 0;
Drop
> +}
> +
> +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
> + enum iris_buffer_type buffer_type)
> +{
> + enum iris_buffer_region region;
> + struct device *dev = NULL;
> + int i;
> +
> + region = iris_get_region(inst, buffer_type);
> +
> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> + if (core->iris_platform_data->cb_data[i].region & region) {
> + dev = core->iris_platform_data->cb_data[i].dev;
> + break;
> + }
You really seem to overcomplicate things. Replace array search with the
indexed array access. Much easier and much better.
enum iris_buffer_region {
IRIS_PIXEL_REGION,
IRIS_BITSTREAM_REGION,
IRIS_NON_PIXEL_REGION,
// add more when necessary
IRIS_NUM_REGIONS,
};
struct iris_core {
struct iris_cb_device cb_devices[IRIS_NUM_REGIONS];
};
region = iris_get_region(inst, buffer_type);
dev = core->cb_devices[region];
if (!dev)
dev = core->dev;
> + }
> +
> + if (!dev)
> + dev = core->dev;
> +
> + return dev;
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
> index b7efe15facb203eea9ae13d5f0abdcc2ea718b4d..ea31726f1789130fccf6b24540a62b86cb3c36ac 100644
> --- a/drivers/media/platform/qcom/iris/iris_resources.h
> +++ b/drivers/media/platform/qcom/iris/iris_resources.h
> @@ -16,5 +16,7 @@ int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
> int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
> int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
> int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
> +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
> + enum iris_buffer_type buffer_type);
>
> #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
> index bd38d84c9cc79d15585ed5dd5f905a37521cb6dc..b61d7941d88662f34a9d2ab3b6c5bd9acf4b5df5 100644
> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
> @@ -107,7 +107,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
> src_vq->drv_priv = inst;
> src_vq->buf_struct_size = sizeof(struct iris_buffer);
> src_vq->min_reqbufs_allocation = MIN_BUFFERS;
> - src_vq->dev = inst->core->dev;
> + src_vq->dev = iris_get_cb_dev(inst->core, inst, BUF_INPUT);
> src_vq->lock = &inst->ctx_q_lock;
> ret = vb2_queue_init(src_vq);
> if (ret)
> @@ -121,7 +121,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
> dst_vq->drv_priv = inst;
> dst_vq->buf_struct_size = sizeof(struct iris_buffer);
> dst_vq->min_reqbufs_allocation = MIN_BUFFERS;
> - dst_vq->dev = inst->core->dev;
> + dst_vq->dev = iris_get_cb_dev(inst->core, inst, BUF_OUTPUT);
> dst_vq->lock = &inst->ctx_q_lock;
>
> return vb2_queue_init(dst_vq);
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation
2026-02-27 14:11 ` [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation Vikash Garodia
@ 2026-02-27 20:28 ` Dmitry Baryshkov
2026-03-03 18:48 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-02-27 20:28 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Feb 27, 2026 at 07:41:22PM +0530, Vikash Garodia wrote:
> The H265 decoder line buffer size calculation for iris4 (VPU4) was
> previously reusing the iris3 formula. While this works for most
> resolutions, certain configurations require a larger buffer size on
> iris4, causing firmware errors during decode. This resolves firmware
> failures seen with specific test vectors on kaanapali (iris4), and fixes
> the following failing fluster tests
> - PICSIZE_C_Bossen_1
> - WPP_E_ericsson_MAIN_2
This reminds me of the commit fixing SC7280 support. Should SC7280 or
all VPU2.0 platforms also use separate formula?
>
> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++++++++++-
> 1 file changed, 50 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index 9270422c16019ba658ee8813940cb9110ad030a1..a4d599c49ce9052b609b9cedf65f669ba78b5407 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -1755,6 +1755,55 @@ static u32 hfi_vpu4x_buffer_line_vp9d(u32 frame_width, u32 frame_height, u32 _yu
> return lb_size + dpb_obp_size;
> }
>
> +static u32 hfi_vpu4x_buffer_line_h265d(u32 frame_width, u32 frame_height, bool is_opb,
> + u32 num_vpp_pipes)
> +{
> + u32 num_lcu_per_pipe, fe_left_lb, se_left_lb, vsp_left_lb, top_lb, qp_size,
> + dpb_obp = 0, lcu_size = 16;
> +
> + num_lcu_per_pipe = (DIV_ROUND_UP(frame_height, lcu_size) / num_vpp_pipes) +
> + (DIV_ROUND_UP(frame_height, lcu_size) % num_vpp_pipes);
> +
> + fe_left_lb = ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT) *
> + FE_LFT_CTRL_LINE_NUMBERS;
> + fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT) *
> + FE_LFT_DB_DATA_LINE_NUMBERS;
> + fe_left_lb += ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT);
> + fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT);
> + fe_left_lb += ALIGN((DMA_ALIGNMENT * 8 * num_lcu_per_pipe), DMA_ALIGNMENT) *
> + FE_LFT_LR_DATA_LINE_NUMBERS;
> +
> + if (is_opb)
> + dpb_obp = size_dpb_opb(frame_height, lcu_size) * num_vpp_pipes;
> +
> + se_left_lb = max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_16_BYTES) >> 3) *
> + MAX_SE_NBR_CTRL_LCU16_LINE_BUFFER_SIZE,
> + max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_32_BYTES) >> 3) *
> + MAX_SE_NBR_CTRL_LCU32_LINE_BUFFER_SIZE,
> + (ALIGN(frame_height, BUFFER_ALIGNMENT_64_BYTES) >> 3) *
> + MAX_SE_NBR_CTRL_LCU64_LINE_BUFFER_SIZE));
> +
> + vsp_left_lb = ALIGN(DIV_ROUND_UP(frame_height, BUFFER_ALIGNMENT_64_BYTES) *
> + H265_NUM_TILE_ROW, DMA_ALIGNMENT);
> +
> + top_lb = ALIGN((DMA_ALIGNMENT * DIV_ROUND_UP(frame_width, lcu_size)), DMA_ALIGNMENT) *
> + FE_TOP_CTRL_LINE_NUMBERS;
> + top_lb += ALIGN(DMA_ALIGNMENT * 2 * DIV_ROUND_UP(frame_width, lcu_size), DMA_ALIGNMENT) *
> + FE_TOP_DATA_LUMA_LINE_NUMBERS;
> + top_lb += ALIGN(DMA_ALIGNMENT * 2 * (DIV_ROUND_UP(frame_width, lcu_size) + 1),
> + DMA_ALIGNMENT) * FE_TOP_DATA_CHROMA_LINE_NUMBERS;
> + top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 2, DMA_ALIGNMENT);
> + top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 6, DMA_ALIGNMENT);
> + top_lb += size_h265d_lb_vsp_top(frame_width, frame_height);
> +
> + qp_size = size_h265d_qp(frame_width, frame_height);
> +
> + return ((ALIGN(dpb_obp, DMA_ALIGNMENT) + ALIGN(se_left_lb, DMA_ALIGNMENT) +
> + ALIGN(vsp_left_lb, DMA_ALIGNMENT)) * num_vpp_pipes) +
> + ALIGN(fe_left_lb, DMA_ALIGNMENT) + ALIGN(top_lb, DMA_ALIGNMENT) +
> + ALIGN(qp_size, DMA_ALIGNMENT);
> +}
> +
> static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> @@ -1770,7 +1819,7 @@ static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
> if (inst->codec == V4L2_PIX_FMT_H264)
> return hfi_buffer_line_h264d(width, height, is_opb, num_vpp_pipes);
> else if (inst->codec == V4L2_PIX_FMT_HEVC)
> - return hfi_buffer_line_h265d(width, height, is_opb, num_vpp_pipes);
> + return hfi_vpu4x_buffer_line_h265d(width, height, is_opb, num_vpp_pipes);
> else if (inst->codec == V4L2_PIX_FMT_VP9)
> return hfi_vpu4x_buffer_line_vp9d(width, height, out_min_count, is_opb,
> num_vpp_pipes);
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 7/7] media: iris: add platform data for kaanapali
2026-02-27 15:48 ` Krzysztof Kozlowski
@ 2026-02-28 7:31 ` Dmitry Baryshkov
0 siblings, 0 replies; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-02-28 7:31 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Feb 27, 2026 at 04:48:31PM +0100, Krzysztof Kozlowski wrote:
> On 27/02/2026 15:11, Vikash Garodia wrote:
> > +
> > +#include <dt-bindings/media/qcom,iris.h>
> > +
> > +#define VIDEO_REGION_VM0_SECURE_NP_ID 1
> > +#define VIDEO_REGION_VM0_NONSECURE_NP_ID 5
> > +
> > +static const char *const kaanapali_clk_reset_table[] = {
> > + "bus0",
> > + "bus1",
> > + "core",
> > + "vcodec0_core",
> > +};
>
> How many copies do you want of this? Data definition never goes to
> headers. That's standard C rules.
It's not. It's a custom, but not a rule.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 15:50 ` Krzysztof Kozlowski
2026-02-27 15:55 ` Krzysztof Kozlowski
@ 2026-03-03 18:10 ` Vikash Garodia
2026-03-04 15:07 ` Krzysztof Kozlowski
1 sibling, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 18:10 UTC (permalink / raw)
To: Krzysztof Kozlowski, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 2/27/2026 9:20 PM, Krzysztof Kozlowski wrote:
> On 27/02/2026 15:11, Vikash Garodia wrote:
>> Kaanapali SOC brings in the new generation of video IP i.e iris4. When
>> compared to previous generation, iris3x, it has,
>> - separate power domains for stream and pixel processing hardware blocks
>> (bse and vpp).
>> - additional power domain for apv codec.
>> - power domains for individual pipes (VPPx).
>> - different clocks and reset lines.
>>
>> iommu-map include all the different stream-ids which can be possibly
>> generated by vpu4 hardware as below,
>> bitstream stream from vcodec
>> non-pixel stream from vcodec
>> non-pixel stream from tensilica
>> pixel stream from vcodec
>> secure bitstream stream from vcodec
>> secure non-pixel stream from vcodec
>> secure non-pixel stream from tensilica
>> secure pixel stream from vcodec
>> firmware stream from tensilica (might be handled by the TZ / hyp)
>
> I cannot really parse above.
I think its better to drop this aspect from commit message, as the patch
precisely describes them.
>
>>
>> This patch is depend on the below dt-schema patch.
>> Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> ---
>> .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
>> include/dt-bindings/media/qcom,iris.h | 18 ++
>> 2 files changed, 279 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml b/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml
>> new file mode 100644
>> index 0000000000000000000000000000000000000000..db734c664a0417d8f5ea55b066f63f42583b1c14
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/media/qcom,kaanapali-iris.yaml
>> @@ -0,0 +1,261 @@
>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/media/qcom,kaanapali-iris.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Qualcomm Kaanapali Iris video encoder and decoder
>> +
>> +maintainers:
>> + - Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> + - Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
>> +
>> +description:
>> + The iris video processing unit is a video encode and decode accelerator
>> + present on Qualcomm Kaanapali SoC.
>> +
>> +definitions:
>> + iommu-types:
>> + items:
>> + - description: Function ID
>> + - description: Phandle to IOMMU
>> + - description: IOMMU stream ID base
>> + - description: IOMMU stream ID mask
>> + - description: Number of stream IDs
>
> You don't need definitions.
Ack, this can be dropped altogether.
>
>> +
>> +properties:
>> + compatible:
>> + const: qcom,kaanapali-iris
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + clocks:
>> + maxItems: 10
>> +
>> + clock-names:
>> + items:
>> + - const: iface
>> + - const: core
>> + - const: vcodec0_core
>> + - const: iface1
>> + - const: core_freerun
>> + - const: vcodec0_core_freerun
>> + - const: vcodec_bse
>> + - const: vcodec_vpp0
>> + - const: vcodec_vpp1
>> + - const: vcodec_apv
>> +
>> + dma-coherent: true
>> +
>> + firmware-name:
>> + maxItems: 1
>> +
>> + interconnects:
>> + maxItems: 2
>> +
>> + interconnect-names:
>> + items:
>> + - const: cpu-cfg
>> + - const: video-mem
>> +
>> + interrupts:
>> + maxItems: 1
>> +
>> + iommu-map:
>> + description: |
>> + - bitstream stream from vcodec
>> + - non-pixel stream from vcodec
>> + - non-pixel stream from tensilica
>> + - pixel stream from vcodec
>> + - secure bitstream stream from vcodec
>> + - secure non-pixel stream from vcodec
>> + - secure non-pixel stream from tensilica
>> + - secure pixel stream from vcodec
>> + # firmware might be handled by the TZ / hyp
>> + - firmware stream from tensilica
>
> Drop description, pointless. How does it help anyhow in writing DTS?
>
>> + $ref: /schemas/types.yaml#/definitions/uint32-matrix
>> + items:
>> + $ref: '#/definitions/iommu-types'
>> + minItems: 5
>> + minItems: 8
>> + maxItems: 9
>
> This solves nothing from the discussions we had. I re-iterated multiple
> times, plus there were internal threads doing the same, that you need to
> define the items to have strict order.
>
describing them as a list of items, please review.
iommu-map:
$ref: /schemas/types.yaml#/definitions/uint32-matrix
items:
- description: bitstream stream from vcodec
items:
- description: Function ID
- description: Phandle to IOMMU
- description: IOMMU stream ID base
- description: IOMMU stream ID mask
- description: Number of stream IDs
- description: non-pixel stream from vcodec
- description: non-pixel stream from tensilica
- description: pixel stream from vcodec
- description: secure bitstream stream from vcodec
- description: secure non-pixel stream from vcodec
- description: secure non-pixel stream from tensilica
- description: secure pixel stream from vcodec
# firmware might be handled by the TZ / hyp
- description: firmware stream from tensilica
minItems: 8
>> +
>> + memory-region:
>> + maxItems: 1
>> +
>> + operating-points-v2: true
>> + opp-table:
>> + type: object
>> +
>> + power-domains:
>> + maxItems: 7
>> +
>> + power-domain-names:
>> + items:
>> + - const: venus
>> + - const: vcodec0
>> + - const: mxc
>> + - const: mmcx
>> + - const: vpp0
>> + - const: vpp1
>> + - const: apv
>> +
>> + resets:
>> + maxItems: 4
>> +
>> + reset-names:
>> + items:
>> + - const: bus0
>> + - const: bus1
>> + - const: core
>> + - const: vcodec0_core
>> +
>
> I assume you checked and used last SoC order of all the entries here.
yes, order is followed as used in earlier SOC.
>
>
>> +required:
>> + - compatible
>> + - reg
>> + - clocks
>> + - clock-names
>> + - dma-coherent
>> + - interconnects
>> + - interconnect-names
>> + - interrupts
>> + - iommu-map
>> + - memory-region
>> + - power-domains
>> + - power-domain-names
>> + - resets
>> + - reset-names
>> +
>> +unevaluatedProperties: false
>
> additionalprops, see writing schema for explanation.
>
I do not see this being added in qcom,sm8750-iris.yaml as well. Since
you made that schema, i generally follow that as reference.
>
> ...
>
>> + };
>> diff --git a/include/dt-bindings/media/qcom,iris.h b/include/dt-bindings/media/qcom,iris.h
>
> Filename must match binding/compatible. I asked for this multiple times.
>
in this case, its applicable for other platforms as well. Naming it as
qcom,kaanapali-iris.h would make it look like kaanapali specific.
>> new file mode 100644
>> index 0000000000000000000000000000000000000000..beb244289466ca938c7e5fe5cf15526f606a3a6c
>> --- /dev/null
>> +++ b/include/dt-bindings/media/qcom,iris.h
>> @@ -0,0 +1,18 @@
>> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
>> +/*
>> + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
>> + */
>> +
>> +#ifndef _DT_BINDINGS_MEDIA_QCOM_IRIS_H
>> +#define _DT_BINDINGS_MEDIA_QCOM_IRIS_H
>> +
>> +/* Function identifiers for iommu-map to attach for the context bank devices */
>> +#define IRIS_BITSTREAM 0x100
>> +#define IRIS_NON_PIXEL 0x101
>> +#define IRIS_PIXEL 0x102
>> +#define IRIS_SECURE_BITSTREAM 0x200
>> +#define IRIS_SECURE_NON_PIXEL 0x201
>> +#define IRIS_SECURE_PIXEL 0x202
>> +#define IRIS_FIRMWARE 0x300
>> +
>
> Abstract identifiers for ABI start with 0 or 1 and are incremented by 1,
> not 0x100. There are also decimal, not hex.
Ack.
>
> Best regards,
> Krzysztof
Regards,
Vikash
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-02-27 19:52 ` Dmitry Baryshkov
@ 2026-03-03 18:13 ` Vikash Garodia
2026-03-03 23:53 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 18:13 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 2/28/2026 1:22 AM, Dmitry Baryshkov wrote:
> On Fri, Feb 27, 2026 at 07:41:17PM +0530, Vikash Garodia wrote:
>> Kaanapali SOC brings in the new generation of video IP i.e iris4. When
>> compared to previous generation, iris3x, it has,
>> - separate power domains for stream and pixel processing hardware blocks
>> (bse and vpp).
>> - additional power domain for apv codec.
>> - power domains for individual pipes (VPPx).
>> - different clocks and reset lines.
>>
>> iommu-map include all the different stream-ids which can be possibly
>> generated by vpu4 hardware as below,
>> bitstream stream from vcodec
>> non-pixel stream from vcodec
>> non-pixel stream from tensilica
>> pixel stream from vcodec
>> secure bitstream stream from vcodec
>> secure non-pixel stream from vcodec
>> secure non-pixel stream from tensilica
>> secure pixel stream from vcodec
>> firmware stream from tensilica (might be handled by the TZ / hyp)
>>
>> This patch is depend on the below dt-schema patch.
>> Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> ---
>> .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
>> include/dt-bindings/media/qcom,iris.h | 18 ++
>> 2 files changed, 279 insertions(+)
>>
>> +
>> + iommu-map:
>> + description: |
>> + - bitstream stream from vcodec
>> + - non-pixel stream from vcodec
>> + - non-pixel stream from tensilica
>> + - pixel stream from vcodec
>> + - secure bitstream stream from vcodec
>> + - secure non-pixel stream from vcodec
>> + - secure non-pixel stream from tensilica
>> + - secure pixel stream from vcodec
>> + # firmware might be handled by the TZ / hyp
>> + - firmware stream from tensilica
>
> Why are you providing description as a list rather than describing each
> item separately? Then you wouldn't need maxItems.
>
rewrote them as below and dropped maxItems. Please review.
iommu-map:
$ref: /schemas/types.yaml#/definitions/uint32-matrix
items:
- description: bitstream stream from vcodec
items:
- description: Function ID
- description: Phandle to IOMMU
- description: IOMMU stream ID base
- description: IOMMU stream ID mask
- description: Number of stream IDs
- description: non-pixel stream from vcodec
- description: non-pixel stream from tensilica
- description: pixel stream from vcodec
- description: secure bitstream stream from vcodec
- description: secure non-pixel stream from vcodec
- description: secure non-pixel stream from tensilica
- description: secure pixel stream from vcodec
# firmware might be handled by the TZ / hyp
- description: firmware stream from tensilica
minItems: 8
>> + $ref: /schemas/types.yaml#/definitions/uint32-matrix
>> + items:
>> + $ref: '#/definitions/iommu-types'
>> + minItems: 5
>> + minItems: 8
>> + maxItems: 9
>> +
>
Regards,
Vikash
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot
2026-02-27 16:49 ` Konrad Dybcio
@ 2026-03-03 18:15 ` Vikash Garodia
2026-03-04 8:57 ` Konrad Dybcio
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 18:15 UTC (permalink / raw)
To: Konrad Dybcio, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Krzysztof Kozlowski, Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 2/27/2026 10:19 PM, Konrad Dybcio wrote:
> On 2/27/26 3:11 PM, Vikash Garodia wrote:
>> Currently the driver switches the vcodec GDSC to hardware (HW) mode
>> before firmware load and boot sequence. GDSC can be powered off, keeping
>> in hw mode, thereby the vcodec registers programmed in TrustZone (TZ)
>> carry default (reset) values.
>> Move the transition to HW mode after firmware load and boot sequence.
>>
>> The bug was exposed with driver configuring different stream ids to
>> different devices via iommu-map. With registers carrying reset values,
>> VPU would not generate desired stream-id, thereby leading to SMMU fault.
>>
>> For vpu4, when GDSC is switched to HW mode, there is a need to perform
>> the reset operation. Without reset, there are occassional issues of
>> register corruption observed. Hence the vpu GDSC switch also involves
>> the reset.
>
> Is that a characteristic of the hardware (e.g. also seen downstream), or
> is that required with upstream iris only?
it was found lately with one of vpu4 variant SOC and applicable for all
vpu4s.
>
> Konrad
Regards,
Vikash
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses
2026-02-27 15:49 ` Krzysztof Kozlowski
@ 2026-03-03 18:26 ` Vikash Garodia
0 siblings, 0 replies; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 18:26 UTC (permalink / raw)
To: Krzysztof Kozlowski, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 2/27/2026 9:19 PM, Krzysztof Kozlowski wrote:
> On 27/02/2026 15:11, Vikash Garodia wrote:
>> Add iris vpu bus support and hooks the new bus into the iommu_buses
>> list. Iris devices need their own bus so that each iris device can run
>> its own dma_configure() logic.
>>
>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> ---
>> drivers/iommu/iommu.c | 4 ++++
>> drivers/media/platform/qcom/iris/Makefile | 4 ++++
>> drivers/media/platform/qcom/iris/iris_vpu_bus.c | 32 +++++++++++++++++++++++++
>> include/linux/iris_vpu_bus.h | 13 ++++++++++
>> 4 files changed, 53 insertions(+)
>>
>> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
>> index 35db5178095404fec87cd0f18e44ea97cf354e78..fd5fb7c10da22ab548d359ca1f44504acc3d646c 100644
>> --- a/drivers/iommu/iommu.c
>> +++ b/drivers/iommu/iommu.c
>> @@ -13,6 +13,7 @@
>> #include <linux/bug.h>
>> #include <linux/types.h>
>> #include <linux/init.h>
>> +#include <linux/iris_vpu_bus.h>
>> #include <linux/export.h>
>> #include <linux/slab.h>
>> #include <linux/errno.h>
>> @@ -178,6 +179,9 @@ static const struct bus_type * const iommu_buses[] = {
>> #ifdef CONFIG_CDX_BUS
>> &cdx_bus_type,
>> #endif
>> +#if IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)
>> + &iris_vpu_bus_type,
>> +#endif
>> };
>>
>> /*
>> diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
>> index 2abbd3aeb4af07e52bf372a4b2f352463529c92c..6f4052b98491aeddc299669334d4c93e9a3420e4 100644
>> --- a/drivers/media/platform/qcom/iris/Makefile
>> +++ b/drivers/media/platform/qcom/iris/Makefile
>> @@ -31,3 +31,7 @@ qcom-iris-objs += iris_platform_gen1.o
>> endif
>>
>> obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o
>> +
>> +ifdef CONFIG_VIDEO_QCOM_IRIS
>> +obj-y += iris_vpu_bus.o
>> +endif
>> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_bus.c b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
>> new file mode 100644
>> index 0000000000000000000000000000000000000000..34ce78d9b0ff1feda15ba4f060a56d02749a0858
>> --- /dev/null
>> +++ b/drivers/media/platform/qcom/iris/iris_vpu_bus.c
>> @@ -0,0 +1,32 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2026 Qualcomm Innovation Center, Inc. All rights reserved.
>> + */
>> +
>> +#include <linux/device.h>
>> +#include <linux/of_device.h>
>> +
>> +#include "iris_platform_common.h"
>> +
>> +static int iris_vpu_bus_dma_configure(struct device *dev)
>> +{
>> + struct iris_context_bank *cb = dev_get_drvdata(dev);
>> +
>> + if (!cb)
>> + return -ENODEV;
>> +
>> + return of_dma_configure_id(dev, dev->parent->of_node, true, &cb->f_id);
>
>
> Apply this patch and build it. Does it build?
it was incorrectly organized, since the struct was defined in subsequent
patch. Will fix this in next revision.
>
> Best regards,
> Krzysztof
Regards,
Vikash
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-02-27 20:20 ` Dmitry Baryshkov
@ 2026-03-03 18:46 ` Vikash Garodia
2026-03-03 22:25 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 18:46 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
> On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
>> Introduce different context banks(CB) and the associated buffer region.
>> Different stream IDs from VPU would be associated to one of these CB.
>> Multiple CBs are needed to increase the IOVA for the video usecases like
>> higher concurrent sessions.
>>
>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> ---
>> .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
>> drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
>> drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
>> drivers/media/platform/qcom/iris/iris_resources.h | 1 +
>> 4 files changed, 111 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
>> index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
>> @@ -204,6 +204,22 @@ struct icc_vote_data {
>> u32 fps;
>> };
>>
>> +enum iris_buffer_region {
>> + IRIS_BITSTREAM_REGION = BIT(0),
>> + IRIS_NON_PIXEL_REGION = BIT(1),
>> + IRIS_PIXEL_REGION = BIT(2),
>> + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
>> + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
>> + IRIS_SECURE_PIXEL_REGION = BIT(5),
>
> Can a context bank belong to multiple regions at the same time?
yes, they would.
>
>> +};
>> +
>> +struct iris_context_bank {
>> + struct device *dev;
>
> Separate data and the actual device. Define a wrapper around struct
> device for the actual runtime usage.
we still have to store the list of dynamically created device. Name can
be used to fetch the device from the list, i think the existing approach
is simpler ?
>
>> + const char *name;
>> + const u32 f_id;
>> + const enum iris_buffer_region region;
>> +};
>> +
>> enum platform_pm_domain_type {
>> IRIS_CTRL_POWER_DOMAIN,
>> IRIS_HW_POWER_DOMAIN,
>> @@ -246,6 +262,8 @@ struct iris_platform_data {
>> u32 inst_fw_caps_enc_size;
>> const struct tz_cp_config *tz_cp_config_data;
>> u32 tz_cp_config_data_size;
>> + struct iris_context_bank *cb_data;
>> + u32 cb_data_size;
>
> Do they differ from platform to platform?
Yes
> Mark them as const, it should be data only.
cb_data_size can be marked as const
>
>> u32 core_arch;
>> u32 hw_response_timeout;
>> struct ubwc_config_data *ubwc_config;
>> diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
>> index ddaacda523ecb9990af0dd0640196223fbcc2cab..557adb038328a75510591d91569819abc0b7b1c9 100644
>> --- a/drivers/media/platform/qcom/iris/iris_probe.c
>> +++ b/drivers/media/platform/qcom/iris/iris_probe.c
>> @@ -123,6 +123,49 @@ static int iris_init_resets(struct iris_core *core)
>> core->iris_platform_data->controller_rst_tbl_size);
>> }
>>
>> +static void iris_destroy_child_device(struct iris_context_bank *cb)
>> +{
>> + struct device *dev = cb->dev;
>> +
>> + if (dev)
>> + device_unregister(dev);
>> +
>> + cb->dev = NULL;
>> +}
>> +
>> +static void iris_deinit_context_bank_devices(struct iris_core *core)
>> +{
>> + struct iris_context_bank *cb;
>> + int i;
>> +
>> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
>> + cb = &core->iris_platform_data->cb_data[i];
>> + iris_destroy_child_device(cb);
>> + }
>> +}
>> +
>> +static int iris_init_context_bank_devices(struct iris_core *core)
>> +{
>> + struct iris_context_bank *cb;
>> + int ret, i;
>> +
>> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
>> + cb = &core->iris_platform_data->cb_data[i];
>> +
>> + ret = iris_create_child_device_and_map(core, cb);
>> + if (ret)
>> + goto err_deinit_cb;
>> + }
>> +
>> + return 0;
>> +
>> +err_deinit_cb:
>> + while (i-- > 0)
>> + iris_destroy_child_device(&core->iris_platform_data->cb_data[i]);
>> +
>> + return ret;
>> +}
>> +
>> static int iris_init_resources(struct iris_core *core)
>> {
>> int ret;
>> @@ -193,6 +236,7 @@ static void iris_remove(struct platform_device *pdev)
>> return;
>>
>> iris_core_deinit(core);
>> + iris_deinit_context_bank_devices(core);
>>
>> video_unregister_device(core->vdev_dec);
>> video_unregister_device(core->vdev_enc);
>> @@ -275,12 +319,18 @@ static int iris_probe(struct platform_device *pdev)
>>
>> platform_set_drvdata(pdev, core);
>>
>> - dma_mask = core->iris_platform_data->dma_mask;
>> -
>> - ret = dma_set_mask_and_coherent(dev, dma_mask);
>> + ret = iris_init_context_bank_devices(core);
>> if (ret)
>> goto err_vdev_unreg_enc;
>>
>> + dma_mask = core->iris_platform_data->dma_mask;
>> +
>> + if (device_iommu_mapped(core->dev)) {
>> + ret = dma_set_mask_and_coherent(core->dev, dma_mask);
>> + if (ret)
>> + goto err_deinit_cb;
>> + }
>> +
>> dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
>> dma_set_seg_boundary(&pdev->dev, DMA_BIT_MASK(32));
>>
>> @@ -288,10 +338,12 @@ static int iris_probe(struct platform_device *pdev)
>> pm_runtime_use_autosuspend(core->dev);
>> ret = devm_pm_runtime_enable(core->dev);
>> if (ret)
>> - goto err_vdev_unreg_enc;
>> + goto err_deinit_cb;
>>
>> return 0;
>>
>> +err_deinit_cb:
>> + iris_deinit_context_bank_devices(core);
>> err_vdev_unreg_enc:
>> video_unregister_device(core->vdev_enc);
>> err_vdev_unreg_dec:
>> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
>> index 773f6548370a257b8ae7332242544266cbbd61a9..be58e8620086d0f82c2c2bda29247483f5c56d79 100644
>> --- a/drivers/media/platform/qcom/iris/iris_resources.c
>> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
>> @@ -6,6 +6,7 @@
>> #include <linux/clk.h>
>> #include <linux/devfreq.h>
>> #include <linux/interconnect.h>
>> +#include <linux/iris_vpu_bus.h>
>> #include <linux/pm_domain.h>
>> #include <linux/pm_opp.h>
>> #include <linux/pm_runtime.h>
>> @@ -141,3 +142,38 @@ int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type
>>
>> return 0;
>> }
>> +
>> +static void iris_device_release(struct device *dev)
>> +{
>> + dev_set_drvdata(dev, NULL);
>> + kfree(dev);
>> +}
>> +
>> +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb)
>> +{
>> + struct device *dev;
>> + int ret;
>> +
>> + dev = kzalloc_obj(*dev);
>> + if (!dev)
>> + return -ENOMEM;
>> +
>> + dev->release = iris_device_release;
>> + dev->bus = &iris_vpu_bus_type;
>> + dev->parent = core->dev;
>> + dev->coherent_dma_mask = core->iris_platform_data->dma_mask;
>> + dev->dma_mask = &dev->coherent_dma_mask;
>> +
>> + dev_set_name(dev, "%s", cb->name);
>> + dev_set_drvdata(dev, cb);
>> +
>> + ret = device_register(dev);
>> + if (ret) {
>> + put_device(dev);
>> + return ret;
>> + }
>> +
>> + cb->dev = dev;
>> +
>> + return 0;
>> +}
>> diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
>> index 6bfbd2dc6db095ec05e53c894e048285f82446c6..b7efe15facb203eea9ae13d5f0abdcc2ea718b4d 100644
>> --- a/drivers/media/platform/qcom/iris/iris_resources.h
>> +++ b/drivers/media/platform/qcom/iris/iris_resources.h
>> @@ -15,5 +15,6 @@ int iris_unset_icc_bw(struct iris_core *core);
>> int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
>> int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
>> int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
>> +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
>>
>> #endif
>>
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation
2026-02-27 20:28 ` Dmitry Baryshkov
@ 2026-03-03 18:48 ` Vikash Garodia
2026-03-03 22:28 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 18:48 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 2/28/2026 1:58 AM, Dmitry Baryshkov wrote:
> On Fri, Feb 27, 2026 at 07:41:22PM +0530, Vikash Garodia wrote:
>> The H265 decoder line buffer size calculation for iris4 (VPU4) was
>> previously reusing the iris3 formula. While this works for most
>> resolutions, certain configurations require a larger buffer size on
>> iris4, causing firmware errors during decode. This resolves firmware
>> failures seen with specific test vectors on kaanapali (iris4), and fixes
>> the following failing fluster tests
>> - PICSIZE_C_Bossen_1
>> - WPP_E_ericsson_MAIN_2
>
> This reminds me of the commit fixing SC7280 support. Should SC7280 or
> all VPU2.0 platforms also use separate formula?
>
for vpu2, there is already a separate formula
>>
>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> ---
>> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++++++++++-
>> 1 file changed, 50 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> index 9270422c16019ba658ee8813940cb9110ad030a1..a4d599c49ce9052b609b9cedf65f669ba78b5407 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
>> @@ -1755,6 +1755,55 @@ static u32 hfi_vpu4x_buffer_line_vp9d(u32 frame_width, u32 frame_height, u32 _yu
>> return lb_size + dpb_obp_size;
>> }
>>
>> +static u32 hfi_vpu4x_buffer_line_h265d(u32 frame_width, u32 frame_height, bool is_opb,
>> + u32 num_vpp_pipes)
>> +{
>> + u32 num_lcu_per_pipe, fe_left_lb, se_left_lb, vsp_left_lb, top_lb, qp_size,
>> + dpb_obp = 0, lcu_size = 16;
>> +
>> + num_lcu_per_pipe = (DIV_ROUND_UP(frame_height, lcu_size) / num_vpp_pipes) +
>> + (DIV_ROUND_UP(frame_height, lcu_size) % num_vpp_pipes);
>> +
>> + fe_left_lb = ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT) *
>> + FE_LFT_CTRL_LINE_NUMBERS;
>> + fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT) *
>> + FE_LFT_DB_DATA_LINE_NUMBERS;
>> + fe_left_lb += ALIGN((DMA_ALIGNMENT * num_lcu_per_pipe), DMA_ALIGNMENT);
>> + fe_left_lb += ALIGN((DMA_ALIGNMENT * 2 * num_lcu_per_pipe), DMA_ALIGNMENT);
>> + fe_left_lb += ALIGN((DMA_ALIGNMENT * 8 * num_lcu_per_pipe), DMA_ALIGNMENT) *
>> + FE_LFT_LR_DATA_LINE_NUMBERS;
>> +
>> + if (is_opb)
>> + dpb_obp = size_dpb_opb(frame_height, lcu_size) * num_vpp_pipes;
>> +
>> + se_left_lb = max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_16_BYTES) >> 3) *
>> + MAX_SE_NBR_CTRL_LCU16_LINE_BUFFER_SIZE,
>> + max_t(u32, (ALIGN(frame_height, BUFFER_ALIGNMENT_32_BYTES) >> 3) *
>> + MAX_SE_NBR_CTRL_LCU32_LINE_BUFFER_SIZE,
>> + (ALIGN(frame_height, BUFFER_ALIGNMENT_64_BYTES) >> 3) *
>> + MAX_SE_NBR_CTRL_LCU64_LINE_BUFFER_SIZE));
>> +
>> + vsp_left_lb = ALIGN(DIV_ROUND_UP(frame_height, BUFFER_ALIGNMENT_64_BYTES) *
>> + H265_NUM_TILE_ROW, DMA_ALIGNMENT);
>> +
>> + top_lb = ALIGN((DMA_ALIGNMENT * DIV_ROUND_UP(frame_width, lcu_size)), DMA_ALIGNMENT) *
>> + FE_TOP_CTRL_LINE_NUMBERS;
>> + top_lb += ALIGN(DMA_ALIGNMENT * 2 * DIV_ROUND_UP(frame_width, lcu_size), DMA_ALIGNMENT) *
>> + FE_TOP_DATA_LUMA_LINE_NUMBERS;
>> + top_lb += ALIGN(DMA_ALIGNMENT * 2 * (DIV_ROUND_UP(frame_width, lcu_size) + 1),
>> + DMA_ALIGNMENT) * FE_TOP_DATA_CHROMA_LINE_NUMBERS;
>> + top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 2, DMA_ALIGNMENT);
>> + top_lb += ALIGN(ALIGN(frame_width, BUFFER_ALIGNMENT_64_BYTES) * 6, DMA_ALIGNMENT);
>> + top_lb += size_h265d_lb_vsp_top(frame_width, frame_height);
>> +
>> + qp_size = size_h265d_qp(frame_width, frame_height);
>> +
>> + return ((ALIGN(dpb_obp, DMA_ALIGNMENT) + ALIGN(se_left_lb, DMA_ALIGNMENT) +
>> + ALIGN(vsp_left_lb, DMA_ALIGNMENT)) * num_vpp_pipes) +
>> + ALIGN(fe_left_lb, DMA_ALIGNMENT) + ALIGN(top_lb, DMA_ALIGNMENT) +
>> + ALIGN(qp_size, DMA_ALIGNMENT);
>> +}
>> +
>> static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
>> {
>> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
>> @@ -1770,7 +1819,7 @@ static u32 iris_vpu4x_dec_line_size(struct iris_inst *inst)
>> if (inst->codec == V4L2_PIX_FMT_H264)
>> return hfi_buffer_line_h264d(width, height, is_opb, num_vpp_pipes);
>> else if (inst->codec == V4L2_PIX_FMT_HEVC)
>> - return hfi_buffer_line_h265d(width, height, is_opb, num_vpp_pipes);
>> + return hfi_vpu4x_buffer_line_h265d(width, height, is_opb, num_vpp_pipes);
>> else if (inst->codec == V4L2_PIX_FMT_VP9)
>> return hfi_vpu4x_buffer_line_vp9d(width, height, out_min_count, is_opb,
>> num_vpp_pipes);
>>
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 5/7] media: iris: add helper to select context bank device
2026-02-27 20:27 ` Dmitry Baryshkov
@ 2026-03-03 19:16 ` Vikash Garodia
2026-03-03 22:27 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-03 19:16 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 2/28/2026 1:57 AM, Dmitry Baryshkov wrote:
> On Fri, Feb 27, 2026 at 07:41:21PM +0530, Vikash Garodia wrote:
>> Depending on the buffer type (input, output, internal and interface
>> queues), associated context bank is selected, if available. Fallback to
>> parent device for backward compatibility.
>>
>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>> ---
>> drivers/media/platform/qcom/iris/iris_buffer.c | 7 +--
>> drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
>> drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++---
>> drivers/media/platform/qcom/iris/iris_resources.c | 60 +++++++++++++++++++++++
>> drivers/media/platform/qcom/iris/iris_resources.h | 2 +
>> drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
>> 6 files changed, 79 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
>> index 9151f43bc6b9c2c34c803de4231d1e6de0bec6c4..95962c19c334f08a74c5b7e8ba978ab631a65e9c 100644
>> --- a/drivers/media/platform/qcom/iris/iris_buffer.c
>> +++ b/drivers/media/platform/qcom/iris/iris_buffer.c
>> @@ -335,8 +335,8 @@ void iris_get_internal_buffers(struct iris_inst *inst, u32 plane)
>> static int iris_create_internal_buffer(struct iris_inst *inst,
>> enum iris_buffer_type buffer_type, u32 index)
>> {
>> + struct device *dev = iris_get_cb_dev(inst->core, inst, buffer_type);
>> struct iris_buffers *buffers = &inst->buffers[buffer_type];
>> - struct iris_core *core = inst->core;
>> struct iris_buffer *buffer;
>>
>> if (!buffers->size)
>> @@ -352,7 +352,7 @@ static int iris_create_internal_buffer(struct iris_inst *inst,
>> buffer->buffer_size = buffers->size;
>> buffer->dma_attrs = DMA_ATTR_WRITE_COMBINE | DMA_ATTR_NO_KERNEL_MAPPING;
>>
>> - buffer->kvaddr = dma_alloc_attrs(core->dev, buffer->buffer_size,
>> + buffer->kvaddr = dma_alloc_attrs(dev, buffer->buffer_size,
>> &buffer->device_addr, GFP_KERNEL, buffer->dma_attrs);
>> if (!buffer->kvaddr) {
>> kfree(buffer);
>> @@ -490,9 +490,10 @@ int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane)
>> int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *buffer)
>> {
>> struct iris_core *core = inst->core;
>> + struct device *dev = iris_get_cb_dev(core, inst, buffer->type);
>>
>> list_del(&buffer->list);
>> - dma_free_attrs(core->dev, buffer->buffer_size, buffer->kvaddr,
>> + dma_free_attrs(dev, buffer->buffer_size, buffer->kvaddr,
>> buffer->device_addr, buffer->dma_attrs);
>> kfree(buffer);
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h
>> index 75bb767761824c4c02e0df9b765896cc093be333..9520aa290b44f06ed2004ad89940c19d1c08a3d2 100644
>> --- a/drivers/media/platform/qcom/iris/iris_buffer.h
>> +++ b/drivers/media/platform/qcom/iris/iris_buffer.h
>> @@ -28,6 +28,7 @@ struct iris_inst;
>> * @BUF_SCRATCH_2: buffer to store encoding context data for HW
>> * @BUF_VPSS: buffer to store VPSS context data for HW
>> * @BUF_PARTIAL: buffer for AV1 IBC data
>> + * @BUF_HFI_QUEUE: buffer for hardware firmware interface queue
>
> Separate commit?
sure, introducing the HFI_QUEUE buffer type can be made into a separate
patch.
>
>> * @BUF_TYPE_MAX: max buffer types
>> */
>> enum iris_buffer_type {
>> @@ -44,6 +45,7 @@ enum iris_buffer_type {
>> BUF_SCRATCH_2,
>> BUF_VPSS,
>> BUF_PARTIAL,
>> + BUF_HFI_QUEUE,
>> BUF_TYPE_MAX,
>> };
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_queue.c b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
>> index b3ed06297953b902d5ea6c452385a88d5431ac66..c1241fb8dc6519020a063cbba87aed665701d7ae 100644
>> --- a/drivers/media/platform/qcom/iris/iris_hfi_queue.c
>> +++ b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
>> @@ -245,25 +245,26 @@ static void iris_hfi_queue_deinit(struct iris_iface_q_info *iface_q)
>>
>> int iris_hfi_queues_init(struct iris_core *core)
>> {
>> + struct device *dev = iris_get_cb_dev(core, NULL, BUF_HFI_QUEUE);
>> struct iris_hfi_queue_table_header *q_tbl_hdr;
>> u32 queue_size;
>>
>> /* Iris hardware requires 4K queue alignment */
>> queue_size = ALIGN((sizeof(*q_tbl_hdr) + (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ)), SZ_4K);
>> - core->iface_q_table_vaddr = dma_alloc_attrs(core->dev, queue_size,
>> + core->iface_q_table_vaddr = dma_alloc_attrs(dev, queue_size,
>> &core->iface_q_table_daddr,
>> GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
>> if (!core->iface_q_table_vaddr) {
>> - dev_err(core->dev, "queues alloc and map failed\n");
>> + dev_err(dev, "queues alloc and map failed\n");
>> return -ENOMEM;
>> }
>>
>> - core->sfr_vaddr = dma_alloc_attrs(core->dev, SFR_SIZE,
>> + core->sfr_vaddr = dma_alloc_attrs(dev, SFR_SIZE,
>> &core->sfr_daddr,
>> GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
>> if (!core->sfr_vaddr) {
>> - dev_err(core->dev, "sfr alloc and map failed\n");
>> - dma_free_attrs(core->dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr,
>> + dev_err(dev, "sfr alloc and map failed\n");
>> + dma_free_attrs(dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr,
>> core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
>> return -ENOMEM;
>> }
>> @@ -291,6 +292,7 @@ int iris_hfi_queues_init(struct iris_core *core)
>>
>> void iris_hfi_queues_deinit(struct iris_core *core)
>> {
>> + struct device *dev = iris_get_cb_dev(core, NULL, BUF_HFI_QUEUE);
>> u32 queue_size;
>>
>> if (!core->iface_q_table_vaddr)
>> @@ -300,7 +302,7 @@ void iris_hfi_queues_deinit(struct iris_core *core)
>> iris_hfi_queue_deinit(&core->message_queue);
>> iris_hfi_queue_deinit(&core->command_queue);
>>
>> - dma_free_attrs(core->dev, SFR_SIZE, core->sfr_vaddr,
>> + dma_free_attrs(dev, SFR_SIZE, core->sfr_vaddr,
>> core->sfr_daddr, DMA_ATTR_WRITE_COMBINE);
>>
>> core->sfr_vaddr = NULL;
>> @@ -309,7 +311,7 @@ void iris_hfi_queues_deinit(struct iris_core *core)
>> queue_size = ALIGN(sizeof(struct iris_hfi_queue_table_header) +
>> (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ), SZ_4K);
>>
>> - dma_free_attrs(core->dev, queue_size, core->iface_q_table_vaddr,
>> + dma_free_attrs(dev, queue_size, core->iface_q_table_vaddr,
>> core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
>>
>> core->iface_q_table_vaddr = NULL;
>> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
>> index be58e8620086d0f82c2c2bda29247483f5c56d79..65544cb0fa8fc4b250b0a0be1bb900d74b999d35 100644
>> --- a/drivers/media/platform/qcom/iris/iris_resources.c
>> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
>> @@ -13,6 +13,7 @@
>> #include <linux/reset.h>
>>
>> #include "iris_core.h"
>> +#include "iris_instance.h"
>> #include "iris_resources.h"
>>
>> #define BW_THRESHOLD 50000
>> @@ -177,3 +178,62 @@ int iris_create_child_device_and_map(struct iris_core *core, struct iris_context
>>
>> return 0;
>> }
>> +
>> +static enum iris_buffer_region iris_get_region(struct iris_inst *inst,
>> + enum iris_buffer_type buffer_type)
>> +{
>> + switch (buffer_type) {
>> + case BUF_INPUT:
>> + if (inst && inst->domain == ENCODER)
>
> Can inst be NULL here?
during queues init/deinit, instances are not created.
>
>> + return IRIS_PIXEL_REGION;
>> + else if (inst && inst->domain == DECODER)
>> + return IRIS_BITSTREAM_REGION;
>
> Are there any other possibilities than encoder and decoder?
will simplify it as
if (inst) {
if (inst->domain == ENCODER)
return IRIS_PIXEL_REGION;
else
return IRIS_BITSTREAM_REGION;
}
>
>> + break;
>> + case BUF_OUTPUT:
>> + if (inst && inst->domain == ENCODER)
>> + return IRIS_BITSTREAM_REGION;
>> + else if (inst && inst->domain == DECODER)
>> + return IRIS_PIXEL_REGION;
>> + break;
>> + case BUF_BIN:
>> + return IRIS_BITSTREAM_REGION;
>> + case BUF_DPB:
>> + case BUF_PARTIAL:
>> + case BUF_SCRATCH_2:
>> + case BUF_VPSS:
>> + return IRIS_PIXEL_REGION;
>> + case BUF_ARP:
>> + case BUF_COMV:
>> + case BUF_HFI_QUEUE:
>> + case BUF_LINE:
>> + case BUF_NON_COMV:
>> + case BUF_PERSIST:
>> + return IRIS_NON_PIXEL_REGION;
>> + default:
>> + return 0;
>
> dev_err(dev, "unsupported buffer type %x\n", buffer_type)
> return -EINVAL;
these are bit fields, returning -EINVAL would still match some bits and
can make the logic as true. 0 can be defined as IRIS_UNKNOWN_REGION
>
>> + }
>> +
>> + return 0;
>
> Drop
>
Ack
>> +}
>> +
>> +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
>> + enum iris_buffer_type buffer_type)
>> +{
>> + enum iris_buffer_region region;
>> + struct device *dev = NULL;
>> + int i;
>> +
>> + region = iris_get_region(inst, buffer_type);
>> +
>> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
>> + if (core->iris_platform_data->cb_data[i].region & region) {
>> + dev = core->iris_platform_data->cb_data[i].dev;
>> + break;
>> + }
>
> You really seem to overcomplicate things. Replace array search with the
> indexed array access. Much easier and much better.
>
> enum iris_buffer_region {
> IRIS_PIXEL_REGION,
> IRIS_BITSTREAM_REGION,
> IRIS_NON_PIXEL_REGION,
> // add more when necessary
> IRIS_NUM_REGIONS,
> };
>
> struct iris_core {
> struct iris_cb_device cb_devices[IRIS_NUM_REGIONS];
> };
>
> region = iris_get_region(inst, buffer_type);
> dev = core->cb_devices[region];
all the regions may/may not be present in all SOC
> if (!dev)
> dev = core->dev;
>
>
>> + }
>> +
>> + if (!dev)
>> + dev = core->dev;
>> +
>> + return dev;
>> +}
>> diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
>> index b7efe15facb203eea9ae13d5f0abdcc2ea718b4d..ea31726f1789130fccf6b24540a62b86cb3c36ac 100644
>> --- a/drivers/media/platform/qcom/iris/iris_resources.h
>> +++ b/drivers/media/platform/qcom/iris/iris_resources.h
>> @@ -16,5 +16,7 @@ int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
>> int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
>> int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
>> int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
>> +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
>> + enum iris_buffer_type buffer_type);
>>
>> #endif
>> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
>> index bd38d84c9cc79d15585ed5dd5f905a37521cb6dc..b61d7941d88662f34a9d2ab3b6c5bd9acf4b5df5 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
>> @@ -107,7 +107,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
>> src_vq->drv_priv = inst;
>> src_vq->buf_struct_size = sizeof(struct iris_buffer);
>> src_vq->min_reqbufs_allocation = MIN_BUFFERS;
>> - src_vq->dev = inst->core->dev;
>> + src_vq->dev = iris_get_cb_dev(inst->core, inst, BUF_INPUT);
>> src_vq->lock = &inst->ctx_q_lock;
>> ret = vb2_queue_init(src_vq);
>> if (ret)
>> @@ -121,7 +121,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
>> dst_vq->drv_priv = inst;
>> dst_vq->buf_struct_size = sizeof(struct iris_buffer);
>> dst_vq->min_reqbufs_allocation = MIN_BUFFERS;
>> - dst_vq->dev = inst->core->dev;
>> + dst_vq->dev = iris_get_cb_dev(inst->core, inst, BUF_OUTPUT);
>> dst_vq->lock = &inst->ctx_q_lock;
>>
>> return vb2_queue_init(dst_vq);
>>
>> --
>> 2.34.1
>>
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-03 18:46 ` Vikash Garodia
@ 2026-03-03 22:25 ` Dmitry Baryshkov
2026-03-05 12:49 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-03 22:25 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
>
> On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
> > On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
> > > Introduce different context banks(CB) and the associated buffer region.
> > > Different stream IDs from VPU would be associated to one of these CB.
> > > Multiple CBs are needed to increase the IOVA for the video usecases like
> > > higher concurrent sessions.
> > >
> > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > ---
> > > .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
> > > drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
> > > drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
> > > drivers/media/platform/qcom/iris/iris_resources.h | 1 +
> > > 4 files changed, 111 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
> > > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > @@ -204,6 +204,22 @@ struct icc_vote_data {
> > > u32 fps;
> > > };
> > > +enum iris_buffer_region {
> > > + IRIS_BITSTREAM_REGION = BIT(0),
> > > + IRIS_NON_PIXEL_REGION = BIT(1),
> > > + IRIS_PIXEL_REGION = BIT(2),
> > > + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
> > > + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
> > > + IRIS_SECURE_PIXEL_REGION = BIT(5),
> >
> > Can a context bank belong to multiple regions at the same time?
>
> yes, they would.
How? Each set of CBs is defined by a separate function in the DT. How
can CB belong to multiple regions? Could you please provide an example?
>
> >
> > > +};
> > > +
> > > +struct iris_context_bank {
> > > + struct device *dev;
> >
> > Separate data and the actual device. Define a wrapper around struct
> > device for the actual runtime usage.
>
> we still have to store the list of dynamically created device. Name can be
> used to fetch the device from the list, i think the existing approach is
> simpler ?
You don't need a list. You have an array of the size, which is known and
fixed. You have at most 9 functions, which means less than 9 devices.
>
> >
> > > + const char *name;
> > > + const u32 f_id;
> > > + const enum iris_buffer_region region;
> > > +};
> > > +
> > > enum platform_pm_domain_type {
> > > IRIS_CTRL_POWER_DOMAIN,
> > > IRIS_HW_POWER_DOMAIN,
> > > @@ -246,6 +262,8 @@ struct iris_platform_data {
> > > u32 inst_fw_caps_enc_size;
> > > const struct tz_cp_config *tz_cp_config_data;
> > > u32 tz_cp_config_data_size;
> > > + struct iris_context_bank *cb_data;
> > > + u32 cb_data_size;
> >
> > Do they differ from platform to platform?
> Yes
>
> > Mark them as const, it should be data only.
>
> cb_data_size can be marked as const
Why is cb_data non-const?
>
> >
> > > u32 core_arch;
> > > u32 hw_response_timeout;
> > > struct ubwc_config_data *ubwc_config;
> > > diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
> > > index ddaacda523ecb9990af0dd0640196223fbcc2cab..557adb038328a75510591d91569819abc0b7b1c9 100644
> > > --- a/drivers/media/platform/qcom/iris/iris_probe.c
> > > +++ b/drivers/media/platform/qcom/iris/iris_probe.c
> > > @@ -123,6 +123,49 @@ static int iris_init_resets(struct iris_core *core)
> > > core->iris_platform_data->controller_rst_tbl_size);
> > > }
> > > +static void iris_destroy_child_device(struct iris_context_bank *cb)
> > > +{
> > > + struct device *dev = cb->dev;
> > > +
> > > + if (dev)
> > > + device_unregister(dev);
> > > +
> > > + cb->dev = NULL;
> > > +}
> > > +
> > > +static void iris_deinit_context_bank_devices(struct iris_core *core)
> > > +{
> > > + struct iris_context_bank *cb;
> > > + int i;
> > > +
> > > + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> > > + cb = &core->iris_platform_data->cb_data[i];
> > > + iris_destroy_child_device(cb);
> > > + }
> > > +}
> > > +
> > > +static int iris_init_context_bank_devices(struct iris_core *core)
> > > +{
> > > + struct iris_context_bank *cb;
> > > + int ret, i;
> > > +
> > > + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> > > + cb = &core->iris_platform_data->cb_data[i];
> > > +
> > > + ret = iris_create_child_device_and_map(core, cb);
> > > + if (ret)
> > > + goto err_deinit_cb;
> > > + }
> > > +
> > > + return 0;
> > > +
> > > +err_deinit_cb:
> > > + while (i-- > 0)
> > > + iris_destroy_child_device(&core->iris_platform_data->cb_data[i]);
> > > +
> > > + return ret;
> > > +}
> > > +
> > > static int iris_init_resources(struct iris_core *core)
> > > {
> > > int ret;
> > > @@ -193,6 +236,7 @@ static void iris_remove(struct platform_device *pdev)
> > > return;
> > > iris_core_deinit(core);
> > > + iris_deinit_context_bank_devices(core);
> > > video_unregister_device(core->vdev_dec);
> > > video_unregister_device(core->vdev_enc);
> > > @@ -275,12 +319,18 @@ static int iris_probe(struct platform_device *pdev)
> > > platform_set_drvdata(pdev, core);
> > > - dma_mask = core->iris_platform_data->dma_mask;
> > > -
> > > - ret = dma_set_mask_and_coherent(dev, dma_mask);
> > > + ret = iris_init_context_bank_devices(core);
> > > if (ret)
> > > goto err_vdev_unreg_enc;
> > > + dma_mask = core->iris_platform_data->dma_mask;
> > > +
> > > + if (device_iommu_mapped(core->dev)) {
> > > + ret = dma_set_mask_and_coherent(core->dev, dma_mask);
> > > + if (ret)
> > > + goto err_deinit_cb;
> > > + }
> > > +
> > > dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
> > > dma_set_seg_boundary(&pdev->dev, DMA_BIT_MASK(32));
> > > @@ -288,10 +338,12 @@ static int iris_probe(struct platform_device *pdev)
> > > pm_runtime_use_autosuspend(core->dev);
> > > ret = devm_pm_runtime_enable(core->dev);
> > > if (ret)
> > > - goto err_vdev_unreg_enc;
> > > + goto err_deinit_cb;
> > > return 0;
> > > +err_deinit_cb:
> > > + iris_deinit_context_bank_devices(core);
> > > err_vdev_unreg_enc:
> > > video_unregister_device(core->vdev_enc);
> > > err_vdev_unreg_dec:
> > > diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
> > > index 773f6548370a257b8ae7332242544266cbbd61a9..be58e8620086d0f82c2c2bda29247483f5c56d79 100644
> > > --- a/drivers/media/platform/qcom/iris/iris_resources.c
> > > +++ b/drivers/media/platform/qcom/iris/iris_resources.c
> > > @@ -6,6 +6,7 @@
> > > #include <linux/clk.h>
> > > #include <linux/devfreq.h>
> > > #include <linux/interconnect.h>
> > > +#include <linux/iris_vpu_bus.h>
> > > #include <linux/pm_domain.h>
> > > #include <linux/pm_opp.h>
> > > #include <linux/pm_runtime.h>
> > > @@ -141,3 +142,38 @@ int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type
> > > return 0;
> > > }
> > > +
> > > +static void iris_device_release(struct device *dev)
> > > +{
> > > + dev_set_drvdata(dev, NULL);
> > > + kfree(dev);
> > > +}
> > > +
> > > +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb)
> > > +{
> > > + struct device *dev;
> > > + int ret;
> > > +
> > > + dev = kzalloc_obj(*dev);
> > > + if (!dev)
> > > + return -ENOMEM;
> > > +
> > > + dev->release = iris_device_release;
> > > + dev->bus = &iris_vpu_bus_type;
> > > + dev->parent = core->dev;
> > > + dev->coherent_dma_mask = core->iris_platform_data->dma_mask;
> > > + dev->dma_mask = &dev->coherent_dma_mask;
> > > +
> > > + dev_set_name(dev, "%s", cb->name);
> > > + dev_set_drvdata(dev, cb);
> > > +
> > > + ret = device_register(dev);
> > > + if (ret) {
> > > + put_device(dev);
> > > + return ret;
> > > + }
> > > +
> > > + cb->dev = dev;
> > > +
> > > + return 0;
> > > +}
> > > diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
> > > index 6bfbd2dc6db095ec05e53c894e048285f82446c6..b7efe15facb203eea9ae13d5f0abdcc2ea718b4d 100644
> > > --- a/drivers/media/platform/qcom/iris/iris_resources.h
> > > +++ b/drivers/media/platform/qcom/iris/iris_resources.h
> > > @@ -15,5 +15,6 @@ int iris_unset_icc_bw(struct iris_core *core);
> > > int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
> > > int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
> > > int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
> > > +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
> > > #endif
> > >
> > > --
> > > 2.34.1
> > >
> >
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 5/7] media: iris: add helper to select context bank device
2026-03-03 19:16 ` Vikash Garodia
@ 2026-03-03 22:27 ` Dmitry Baryshkov
2026-03-04 15:29 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-03 22:27 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Wed, Mar 04, 2026 at 12:46:27AM +0530, Vikash Garodia wrote:
>
>
> On 2/28/2026 1:57 AM, Dmitry Baryshkov wrote:
> > On Fri, Feb 27, 2026 at 07:41:21PM +0530, Vikash Garodia wrote:
> > > Depending on the buffer type (input, output, internal and interface
> > > queues), associated context bank is selected, if available. Fallback to
> > > parent device for backward compatibility.
> > >
> > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > ---
> > > drivers/media/platform/qcom/iris/iris_buffer.c | 7 +--
> > > drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
> > > drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++---
> > > drivers/media/platform/qcom/iris/iris_resources.c | 60 +++++++++++++++++++++++
> > > drivers/media/platform/qcom/iris/iris_resources.h | 2 +
> > > drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
> > > 6 files changed, 79 insertions(+), 12 deletions(-)
> > >
> > > @@ -177,3 +178,62 @@ int iris_create_child_device_and_map(struct iris_core *core, struct iris_context
> > > return 0;
> > > }
> > > +
> > > +static enum iris_buffer_region iris_get_region(struct iris_inst *inst,
> > > + enum iris_buffer_type buffer_type)
> > > +{
> > > + switch (buffer_type) {
> > > + case BUF_INPUT:
> > > + if (inst && inst->domain == ENCODER)
> >
> > Can inst be NULL here?
>
> during queues init/deinit, instances are not created.
Is this function being called during queues init?
>
> >
> > > + return IRIS_PIXEL_REGION;
> > > + else if (inst && inst->domain == DECODER)
> > > + return IRIS_BITSTREAM_REGION;
> >
> > Are there any other possibilities than encoder and decoder?
>
> will simplify it as
>
> if (inst) {
> if (inst->domain == ENCODER)
> return IRIS_PIXEL_REGION;
> else
> return IRIS_BITSTREAM_REGION;
> }
> >
> > > + break;
> > > + case BUF_OUTPUT:
> > > + if (inst && inst->domain == ENCODER)
> > > + return IRIS_BITSTREAM_REGION;
> > > + else if (inst && inst->domain == DECODER)
> > > + return IRIS_PIXEL_REGION;
> > > + break;
> > > + case BUF_BIN:
> > > + return IRIS_BITSTREAM_REGION;
> > > + case BUF_DPB:
> > > + case BUF_PARTIAL:
> > > + case BUF_SCRATCH_2:
> > > + case BUF_VPSS:
> > > + return IRIS_PIXEL_REGION;
> > > + case BUF_ARP:
> > > + case BUF_COMV:
> > > + case BUF_HFI_QUEUE:
> > > + case BUF_LINE:
> > > + case BUF_NON_COMV:
> > > + case BUF_PERSIST:
> > > + return IRIS_NON_PIXEL_REGION;
> > > + default:
> > > + return 0;
> >
> > dev_err(dev, "unsupported buffer type %x\n", buffer_type)
> > return -EINVAL;
>
> these are bit fields, returning -EINVAL would still match some bits and can
> make the logic as true. 0 can be defined as IRIS_UNKNOWN_REGION
Yes, sounds good.
>
> >
> > > + }
> > > +
> > > + return 0;
> >
> > Drop
> >
>
> Ack
>
> > > +}
> > > +
> > > +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
> > > + enum iris_buffer_type buffer_type)
> > > +{
> > > + enum iris_buffer_region region;
> > > + struct device *dev = NULL;
> > > + int i;
> > > +
> > > + region = iris_get_region(inst, buffer_type);
> > > +
> > > + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> > > + if (core->iris_platform_data->cb_data[i].region & region) {
> > > + dev = core->iris_platform_data->cb_data[i].dev;
> > > + break;
> > > + }
> >
> > You really seem to overcomplicate things. Replace array search with the
> > indexed array access. Much easier and much better.
> >
> > enum iris_buffer_region {
> > IRIS_PIXEL_REGION,
> > IRIS_BITSTREAM_REGION,
> > IRIS_NON_PIXEL_REGION,
> > // add more when necessary
> > IRIS_NUM_REGIONS,
> > };
> >
> > struct iris_core {
> > struct iris_cb_device cb_devices[IRIS_NUM_REGIONS];
> > };
> >
> > region = iris_get_region(inst, buffer_type);
> > dev = core->cb_devices[region];
>
> all the regions may/may not be present in all SOC
You can check for dev != NULL afterwards.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation
2026-03-03 18:48 ` Vikash Garodia
@ 2026-03-03 22:28 ` Dmitry Baryshkov
2026-03-04 15:40 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-03 22:28 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Wed, Mar 04, 2026 at 12:18:58AM +0530, Vikash Garodia wrote:
>
> On 2/28/2026 1:58 AM, Dmitry Baryshkov wrote:
> > On Fri, Feb 27, 2026 at 07:41:22PM +0530, Vikash Garodia wrote:
> > > The H265 decoder line buffer size calculation for iris4 (VPU4) was
> > > previously reusing the iris3 formula. While this works for most
> > > resolutions, certain configurations require a larger buffer size on
> > > iris4, causing firmware errors during decode. This resolves firmware
> > > failures seen with specific test vectors on kaanapali (iris4), and fixes
> > > the following failing fluster tests
> > > - PICSIZE_C_Bossen_1
> > > - WPP_E_ericsson_MAIN_2
> >
> > This reminds me of the commit fixing SC7280 support. Should SC7280 or
> > all VPU2.0 platforms also use separate formula?
> >
> for vpu2, there is already a separate formula
It was more of "do we need separate formulas within vpu2".
>
> > >
> > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > ---
> > > drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++++++++++-
> > > 1 file changed, 50 insertions(+), 1 deletion(-)
> > >
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-03-03 18:13 ` Vikash Garodia
@ 2026-03-03 23:53 ` Dmitry Baryshkov
2026-03-04 15:02 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-03 23:53 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Tue, Mar 03, 2026 at 11:43:40PM +0530, Vikash Garodia wrote:
>
>
> On 2/28/2026 1:22 AM, Dmitry Baryshkov wrote:
> > On Fri, Feb 27, 2026 at 07:41:17PM +0530, Vikash Garodia wrote:
> > > Kaanapali SOC brings in the new generation of video IP i.e iris4. When
> > > compared to previous generation, iris3x, it has,
> > > - separate power domains for stream and pixel processing hardware blocks
> > > (bse and vpp).
> > > - additional power domain for apv codec.
> > > - power domains for individual pipes (VPPx).
> > > - different clocks and reset lines.
> > >
> > > iommu-map include all the different stream-ids which can be possibly
> > > generated by vpu4 hardware as below,
> > > bitstream stream from vcodec
> > > non-pixel stream from vcodec
> > > non-pixel stream from tensilica
> > > pixel stream from vcodec
> > > secure bitstream stream from vcodec
> > > secure non-pixel stream from vcodec
> > > secure non-pixel stream from tensilica
> > > secure pixel stream from vcodec
> > > firmware stream from tensilica (might be handled by the TZ / hyp)
> > >
> > > This patch is depend on the below dt-schema patch.
> > > Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
> > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > ---
> > > .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
> > > include/dt-bindings/media/qcom,iris.h | 18 ++
> > > 2 files changed, 279 insertions(+)
> > >
> > > +
> > > + iommu-map:
> > > + description: |
> > > + - bitstream stream from vcodec
> > > + - non-pixel stream from vcodec
> > > + - non-pixel stream from tensilica
> > > + - pixel stream from vcodec
> > > + - secure bitstream stream from vcodec
> > > + - secure non-pixel stream from vcodec
> > > + - secure non-pixel stream from tensilica
> > > + - secure pixel stream from vcodec
> > > + # firmware might be handled by the TZ / hyp
> > > + - firmware stream from tensilica
> >
> > Why are you providing description as a list rather than describing each
> > item separately? Then you wouldn't need maxItems.
> >
>
> rewrote them as below and dropped maxItems. Please review.
>
> iommu-map:
> $ref: /schemas/types.yaml#/definitions/uint32-matrix
> items:
> - description: bitstream stream from vcodec
> items:
> - description: Function ID
> - description: Phandle to IOMMU
> - description: IOMMU stream ID base
> - description: IOMMU stream ID mask
> - description: Number of stream IDs
I'm not a pro in the DT. Is the itemization of the first item reused for
the rest of the items?
> - description: non-pixel stream from vcodec
> - description: non-pixel stream from tensilica
> - description: pixel stream from vcodec
> - description: secure bitstream stream from vcodec
> - description: secure non-pixel stream from vcodec
> - description: secure non-pixel stream from tensilica
> - description: secure pixel stream from vcodec
> # firmware might be handled by the TZ / hyp
> - description: firmware stream from tensilica
> minItems: 8
>
> > > + $ref: /schemas/types.yaml#/definitions/uint32-matrix
> > > + items:
> > > + $ref: '#/definitions/iommu-types'
> > > + minItems: 5
> > > + minItems: 8
> > > + maxItems: 9
> > > +
> >
>
> Regards,
> Vikash
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot
2026-03-03 18:15 ` Vikash Garodia
@ 2026-03-04 8:57 ` Konrad Dybcio
0 siblings, 0 replies; 47+ messages in thread
From: Konrad Dybcio @ 2026-03-04 8:57 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Krzysztof Kozlowski, Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 3/3/26 7:15 PM, Vikash Garodia wrote:
>
>
> On 2/27/2026 10:19 PM, Konrad Dybcio wrote:
>> On 2/27/26 3:11 PM, Vikash Garodia wrote:
>>> Currently the driver switches the vcodec GDSC to hardware (HW) mode
>>> before firmware load and boot sequence. GDSC can be powered off, keeping
>>> in hw mode, thereby the vcodec registers programmed in TrustZone (TZ)
>>> carry default (reset) values.
>>> Move the transition to HW mode after firmware load and boot sequence.
>>>
>>> The bug was exposed with driver configuring different stream ids to
>>> different devices via iommu-map. With registers carrying reset values,
>>> VPU would not generate desired stream-id, thereby leading to SMMU fault.
>>>
>>> For vpu4, when GDSC is switched to HW mode, there is a need to perform
>>> the reset operation. Without reset, there are occassional issues of
>>> register corruption observed. Hence the vpu GDSC switch also involves
>>> the reset.
>>
>> Is that a characteristic of the hardware (e.g. also seen downstream), or
>> is that required with upstream iris only?
>
> it was found lately with one of vpu4 variant SOC and applicable for all vpu4s.
Thanks
Konrad
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-03-03 23:53 ` Dmitry Baryshkov
@ 2026-03-04 15:02 ` Vikash Garodia
2026-03-05 3:33 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-04 15:02 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 3/4/2026 5:23 AM, Dmitry Baryshkov wrote:
> On Tue, Mar 03, 2026 at 11:43:40PM +0530, Vikash Garodia wrote:
>>
>>
>> On 2/28/2026 1:22 AM, Dmitry Baryshkov wrote:
>>> On Fri, Feb 27, 2026 at 07:41:17PM +0530, Vikash Garodia wrote:
>>>> Kaanapali SOC brings in the new generation of video IP i.e iris4. When
>>>> compared to previous generation, iris3x, it has,
>>>> - separate power domains for stream and pixel processing hardware blocks
>>>> (bse and vpp).
>>>> - additional power domain for apv codec.
>>>> - power domains for individual pipes (VPPx).
>>>> - different clocks and reset lines.
>>>>
>>>> iommu-map include all the different stream-ids which can be possibly
>>>> generated by vpu4 hardware as below,
>>>> bitstream stream from vcodec
>>>> non-pixel stream from vcodec
>>>> non-pixel stream from tensilica
>>>> pixel stream from vcodec
>>>> secure bitstream stream from vcodec
>>>> secure non-pixel stream from vcodec
>>>> secure non-pixel stream from tensilica
>>>> secure pixel stream from vcodec
>>>> firmware stream from tensilica (might be handled by the TZ / hyp)
>>>>
>>>> This patch is depend on the below dt-schema patch.
>>>> Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
>>>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>>>> ---
>>>> .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
>>>> include/dt-bindings/media/qcom,iris.h | 18 ++
>>>> 2 files changed, 279 insertions(+)
>>>>
>>>> +
>>>> + iommu-map:
>>>> + description: |
>>>> + - bitstream stream from vcodec
>>>> + - non-pixel stream from vcodec
>>>> + - non-pixel stream from tensilica
>>>> + - pixel stream from vcodec
>>>> + - secure bitstream stream from vcodec
>>>> + - secure non-pixel stream from vcodec
>>>> + - secure non-pixel stream from tensilica
>>>> + - secure pixel stream from vcodec
>>>> + # firmware might be handled by the TZ / hyp
>>>> + - firmware stream from tensilica
>>>
>>> Why are you providing description as a list rather than describing each
>>> item separately? Then you wouldn't need maxItems.
>>>
>>
>> rewrote them as below and dropped maxItems. Please review.
>>
>> iommu-map:
>> $ref: /schemas/types.yaml#/definitions/uint32-matrix
>> items:
>> - description: bitstream stream from vcodec
>> items:
>> - description: Function ID
>> - description: Phandle to IOMMU
>> - description: IOMMU stream ID base
>> - description: IOMMU stream ID mask
>> - description: Number of stream IDs
>
> I'm not a pro in the DT. Is the itemization of the first item reused for
> the rest of the items?
yes. As a trial, if i remove one of the itemization from above schema,
then checker throws error saying 5x9 arguments in the example is *too
long* as it tries to fit it as per schema i.e 4x9.
>
>> - description: non-pixel stream from vcodec
>> - description: non-pixel stream from tensilica
>> - description: pixel stream from vcodec
>> - description: secure bitstream stream from vcodec
>> - description: secure non-pixel stream from vcodec
>> - description: secure non-pixel stream from tensilica
>> - description: secure pixel stream from vcodec
>> # firmware might be handled by the TZ / hyp
>> - description: firmware stream from tensilica
>> minItems: 8
>>
>>>> + $ref: /schemas/types.yaml#/definitions/uint32-matrix
>>>> + items:
>>>> + $ref: '#/definitions/iommu-types'
>>>> + minItems: 5
>>>> + minItems: 8
>>>> + maxItems: 9
>>>> +
>>>
>>
>> Regards,
>> Vikash
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-03-03 18:10 ` Vikash Garodia
@ 2026-03-04 15:07 ` Krzysztof Kozlowski
2026-03-05 12:23 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Krzysztof Kozlowski @ 2026-03-04 15:07 UTC (permalink / raw)
To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 03/03/2026 19:10, Vikash Garodia wrote:
>
>>
>> ...
>>
>>> + };
>>> diff --git a/include/dt-bindings/media/qcom,iris.h b/include/dt-bindings/media/qcom,iris.h
>>
>> Filename must match binding/compatible. I asked for this multiple times.
>>
>
> in this case, its applicable for other platforms as well. Naming it as
> qcom,kaanapali-iris.h would make it look like kaanapali specific.
I repeated that feedback way too many times.
NAK
Nacked-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 5/7] media: iris: add helper to select context bank device
2026-03-03 22:27 ` Dmitry Baryshkov
@ 2026-03-04 15:29 ` Vikash Garodia
2026-03-05 3:40 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-04 15:29 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 3/4/2026 3:57 AM, Dmitry Baryshkov wrote:
> On Wed, Mar 04, 2026 at 12:46:27AM +0530, Vikash Garodia wrote:
>>
>>
>> On 2/28/2026 1:57 AM, Dmitry Baryshkov wrote:
>>> On Fri, Feb 27, 2026 at 07:41:21PM +0530, Vikash Garodia wrote:
>>>> Depending on the buffer type (input, output, internal and interface
>>>> queues), associated context bank is selected, if available. Fallback to
>>>> parent device for backward compatibility.
>>>>
>>>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>>>> ---
>>>> drivers/media/platform/qcom/iris/iris_buffer.c | 7 +--
>>>> drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
>>>> drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++---
>>>> drivers/media/platform/qcom/iris/iris_resources.c | 60 +++++++++++++++++++++++
>>>> drivers/media/platform/qcom/iris/iris_resources.h | 2 +
>>>> drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
>>>> 6 files changed, 79 insertions(+), 12 deletions(-)
>>>>
>>>> @@ -177,3 +178,62 @@ int iris_create_child_device_and_map(struct iris_core *core, struct iris_context
>>>> return 0;
>>>> }
>>>> +
>>>> +static enum iris_buffer_region iris_get_region(struct iris_inst *inst,
>>>> + enum iris_buffer_type buffer_type)
>>>> +{
>>>> + switch (buffer_type) {
>>>> + case BUF_INPUT:
>>>> + if (inst && inst->domain == ENCODER)
>>>
>>> Can inst be NULL here?
>>
>> during queues init/deinit, instances are not created.
>
> Is this function being called during queues init?
yes, via iris_get_cb_dev()
>
>>
>>>
>>>> + return IRIS_PIXEL_REGION;
>>>> + else if (inst && inst->domain == DECODER)
>>>> + return IRIS_BITSTREAM_REGION;
>>>
>>> Are there any other possibilities than encoder and decoder?
>>
>> will simplify it as
>>
>> if (inst) {
>> if (inst->domain == ENCODER)
>> return IRIS_PIXEL_REGION;
>> else
>> return IRIS_BITSTREAM_REGION;
>> }
>>>
>>>> + break;
>>>> + case BUF_OUTPUT:
>>>> + if (inst && inst->domain == ENCODER)
>>>> + return IRIS_BITSTREAM_REGION;
>>>> + else if (inst && inst->domain == DECODER)
>>>> + return IRIS_PIXEL_REGION;
>>>> + break;
>>>> + case BUF_BIN:
>>>> + return IRIS_BITSTREAM_REGION;
>>>> + case BUF_DPB:
>>>> + case BUF_PARTIAL:
>>>> + case BUF_SCRATCH_2:
>>>> + case BUF_VPSS:
>>>> + return IRIS_PIXEL_REGION;
>>>> + case BUF_ARP:
>>>> + case BUF_COMV:
>>>> + case BUF_HFI_QUEUE:
>>>> + case BUF_LINE:
>>>> + case BUF_NON_COMV:
>>>> + case BUF_PERSIST:
>>>> + return IRIS_NON_PIXEL_REGION;
>>>> + default:
>>>> + return 0;
>>>
>>> dev_err(dev, "unsupported buffer type %x\n", buffer_type)
>>> return -EINVAL;
>>
>> these are bit fields, returning -EINVAL would still match some bits and can
>> make the logic as true. 0 can be defined as IRIS_UNKNOWN_REGION
>
> Yes, sounds good.
>
>>
>>>
>>>> + }
>>>> +
>>>> + return 0;
>>>
>>> Drop
>>>
>>
>> Ack
>>
>>>> +}
>>>> +
>>>> +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
>>>> + enum iris_buffer_type buffer_type)
>>>> +{
>>>> + enum iris_buffer_region region;
>>>> + struct device *dev = NULL;
>>>> + int i;
>>>> +
>>>> + region = iris_get_region(inst, buffer_type);
>>>> +
>>>> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
>>>> + if (core->iris_platform_data->cb_data[i].region & region) {
>>>> + dev = core->iris_platform_data->cb_data[i].dev;
>>>> + break;
>>>> + }
>>>
>>> You really seem to overcomplicate things. Replace array search with the
>>> indexed array access. Much easier and much better.
>>>
>>> enum iris_buffer_region {
>>> IRIS_PIXEL_REGION,
>>> IRIS_BITSTREAM_REGION,
>>> IRIS_NON_PIXEL_REGION,
>>> // add more when necessary
>>> IRIS_NUM_REGIONS,
>>> };
>>>
>>> struct iris_core {
>>> struct iris_cb_device cb_devices[IRIS_NUM_REGIONS];
>>> };
>>>
>>> region = iris_get_region(inst, buffer_type);
>>> dev = core->cb_devices[region];
>>
>> all the regions may/may not be present in all SOC
>
> You can check for dev != NULL afterwards.
with one CB to multiple region mapping, this logic would not work.
Regards,
Vikash
>
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation
2026-03-03 22:28 ` Dmitry Baryshkov
@ 2026-03-04 15:40 ` Vikash Garodia
2026-03-05 3:41 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-04 15:40 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 3/4/2026 3:58 AM, Dmitry Baryshkov wrote:
> On Wed, Mar 04, 2026 at 12:18:58AM +0530, Vikash Garodia wrote:
>>
>> On 2/28/2026 1:58 AM, Dmitry Baryshkov wrote:
>>> On Fri, Feb 27, 2026 at 07:41:22PM +0530, Vikash Garodia wrote:
>>>> The H265 decoder line buffer size calculation for iris4 (VPU4) was
>>>> previously reusing the iris3 formula. While this works for most
>>>> resolutions, certain configurations require a larger buffer size on
>>>> iris4, causing firmware errors during decode. This resolves firmware
>>>> failures seen with specific test vectors on kaanapali (iris4), and fixes
>>>> the following failing fluster tests
>>>> - PICSIZE_C_Bossen_1
>>>> - WPP_E_ericsson_MAIN_2
>>>
>>> This reminds me of the commit fixing SC7280 support. Should SC7280 or
>>> all VPU2.0 platforms also use separate formula?
>>>
>> for vpu2, there is already a separate formula
>
> It was more of "do we need separate formulas within vpu2".
vpu2/3 uses the same one currently here [1].
vpu4 seems to be using quite a different formula to consider it within
vpu2/3.
[1]https://elixir.bootlin.com/linux/v6.19.3/source/drivers/media/platform/qcom/iris/iris_vpu_buffer.c#L313
>
>>
>>>>
>>>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>>>> ---
>>>> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++++++++++-
>>>> 1 file changed, 50 insertions(+), 1 deletion(-)
>>>>
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-03-04 15:02 ` Vikash Garodia
@ 2026-03-05 3:33 ` Dmitry Baryshkov
0 siblings, 0 replies; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-05 3:33 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Wed, Mar 04, 2026 at 08:32:53PM +0530, Vikash Garodia wrote:
>
>
> On 3/4/2026 5:23 AM, Dmitry Baryshkov wrote:
> > On Tue, Mar 03, 2026 at 11:43:40PM +0530, Vikash Garodia wrote:
> > >
> > >
> > > On 2/28/2026 1:22 AM, Dmitry Baryshkov wrote:
> > > > On Fri, Feb 27, 2026 at 07:41:17PM +0530, Vikash Garodia wrote:
> > > > > Kaanapali SOC brings in the new generation of video IP i.e iris4. When
> > > > > compared to previous generation, iris3x, it has,
> > > > > - separate power domains for stream and pixel processing hardware blocks
> > > > > (bse and vpp).
> > > > > - additional power domain for apv codec.
> > > > > - power domains for individual pipes (VPPx).
> > > > > - different clocks and reset lines.
> > > > >
> > > > > iommu-map include all the different stream-ids which can be possibly
> > > > > generated by vpu4 hardware as below,
> > > > > bitstream stream from vcodec
> > > > > non-pixel stream from vcodec
> > > > > non-pixel stream from tensilica
> > > > > pixel stream from vcodec
> > > > > secure bitstream stream from vcodec
> > > > > secure non-pixel stream from vcodec
> > > > > secure non-pixel stream from tensilica
> > > > > secure pixel stream from vcodec
> > > > > firmware stream from tensilica (might be handled by the TZ / hyp)
> > > > >
> > > > > This patch is depend on the below dt-schema patch.
> > > > > Link: https://github.com/devicetree-org/dt-schema/pull/184/changes/d341298d62805bc972dfba691da6b3b62aa3ff15
> > > > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > > > ---
> > > > > .../bindings/media/qcom,kaanapali-iris.yaml | 261 +++++++++++++++++++++
> > > > > include/dt-bindings/media/qcom,iris.h | 18 ++
> > > > > 2 files changed, 279 insertions(+)
> > > > >
> > > > > +
> > > > > + iommu-map:
> > > > > + description: |
> > > > > + - bitstream stream from vcodec
> > > > > + - non-pixel stream from vcodec
> > > > > + - non-pixel stream from tensilica
> > > > > + - pixel stream from vcodec
> > > > > + - secure bitstream stream from vcodec
> > > > > + - secure non-pixel stream from vcodec
> > > > > + - secure non-pixel stream from tensilica
> > > > > + - secure pixel stream from vcodec
> > > > > + # firmware might be handled by the TZ / hyp
> > > > > + - firmware stream from tensilica
> > > >
> > > > Why are you providing description as a list rather than describing each
> > > > item separately? Then you wouldn't need maxItems.
> > > >
> > >
> > > rewrote them as below and dropped maxItems. Please review.
> > >
> > > iommu-map:
> > > $ref: /schemas/types.yaml#/definitions/uint32-matrix
> > > items:
> > > - description: bitstream stream from vcodec
> > > items:
> > > - description: Function ID
> > > - description: Phandle to IOMMU
> > > - description: IOMMU stream ID base
> > > - description: IOMMU stream ID mask
> > > - description: Number of stream IDs
> >
> > I'm not a pro in the DT. Is the itemization of the first item reused for
> > the rest of the items?
>
> yes. As a trial, if i remove one of the itemization from above schema, then
> checker throws error saying 5x9 arguments in the example is *too long* as it
> tries to fit it as per schema i.e 4x9.
Ack, thanks for the test!
>
> >
> > > - description: non-pixel stream from vcodec
> > > - description: non-pixel stream from tensilica
> > > - description: pixel stream from vcodec
> > > - description: secure bitstream stream from vcodec
> > > - description: secure non-pixel stream from vcodec
> > > - description: secure non-pixel stream from tensilica
> > > - description: secure pixel stream from vcodec
> > > # firmware might be handled by the TZ / hyp
> > > - description: firmware stream from tensilica
> > > minItems: 8
> > >
> > > > > + $ref: /schemas/types.yaml#/definitions/uint32-matrix
> > > > > + items:
> > > > > + $ref: '#/definitions/iommu-types'
> > > > > + minItems: 5
> > > > > + minItems: 8
> > > > > + maxItems: 9
> > > > > +
> > > >
> > >
> > > Regards,
> > > Vikash
> >
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 5/7] media: iris: add helper to select context bank device
2026-03-04 15:29 ` Vikash Garodia
@ 2026-03-05 3:40 ` Dmitry Baryshkov
0 siblings, 0 replies; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-05 3:40 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Wed, Mar 04, 2026 at 08:59:24PM +0530, Vikash Garodia wrote:
>
> On 3/4/2026 3:57 AM, Dmitry Baryshkov wrote:
> > On Wed, Mar 04, 2026 at 12:46:27AM +0530, Vikash Garodia wrote:
> > >
> > >
> > > On 2/28/2026 1:57 AM, Dmitry Baryshkov wrote:
> > > > On Fri, Feb 27, 2026 at 07:41:21PM +0530, Vikash Garodia wrote:
> > > > > Depending on the buffer type (input, output, internal and interface
> > > > > queues), associated context bank is selected, if available. Fallback to
> > > > > parent device for backward compatibility.
> > > > >
> > > > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > > > ---
> > > > > drivers/media/platform/qcom/iris/iris_buffer.c | 7 +--
> > > > > drivers/media/platform/qcom/iris/iris_buffer.h | 2 +
> > > > > drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++---
> > > > > drivers/media/platform/qcom/iris/iris_resources.c | 60 +++++++++++++++++++++++
> > > > > drivers/media/platform/qcom/iris/iris_resources.h | 2 +
> > > > > drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-
> > > > > 6 files changed, 79 insertions(+), 12 deletions(-)
> > > > >
> > > > > @@ -177,3 +178,62 @@ int iris_create_child_device_and_map(struct iris_core *core, struct iris_context
> > > > > return 0;
> > > > > }
> > > > > +
> > > > > +static enum iris_buffer_region iris_get_region(struct iris_inst *inst,
> > > > > + enum iris_buffer_type buffer_type)
> > > > > +{
> > > > > + switch (buffer_type) {
> > > > > + case BUF_INPUT:
> > > > > + if (inst && inst->domain == ENCODER)
> > > >
> > > > Can inst be NULL here?
> > >
> > > during queues init/deinit, instances are not created.
> >
> > Is this function being called during queues init?
>
> yes, via iris_get_cb_dev()
I think this is a part of overcomplication. queue init uses
BUF_HFI_QUEUE, which always maps to NON_PIXEL. If you remove all
indirection and device lists, you can access necessary device directly.
BUF_HFI_QUEUE looks like an extra entity created just to get the device.
>
> >
> > >
> > > >
> > > > > +}
> > > > > +
> > > > > +struct device *iris_get_cb_dev(struct iris_core *core, struct iris_inst *inst,
> > > > > + enum iris_buffer_type buffer_type)
> > > > > +{
> > > > > + enum iris_buffer_region region;
> > > > > + struct device *dev = NULL;
> > > > > + int i;
> > > > > +
> > > > > + region = iris_get_region(inst, buffer_type);
> > > > > +
> > > > > + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
> > > > > + if (core->iris_platform_data->cb_data[i].region & region) {
> > > > > + dev = core->iris_platform_data->cb_data[i].dev;
> > > > > + break;
> > > > > + }
> > > >
> > > > You really seem to overcomplicate things. Replace array search with the
> > > > indexed array access. Much easier and much better.
> > > >
> > > > enum iris_buffer_region {
> > > > IRIS_PIXEL_REGION,
> > > > IRIS_BITSTREAM_REGION,
> > > > IRIS_NON_PIXEL_REGION,
> > > > // add more when necessary
> > > > IRIS_NUM_REGIONS,
> > > > };
> > > >
> > > > struct iris_core {
> > > > struct iris_cb_device cb_devices[IRIS_NUM_REGIONS];
> > > > };
> > > >
> > > > region = iris_get_region(inst, buffer_type);
> > > > dev = core->cb_devices[region];
> > >
> > > all the regions may/may not be present in all SOC
> >
> > You can check for dev != NULL afterwards.
>
> with one CB to multiple region mapping, this logic would not work.
I'm not sure I follow. We always need only one CB device and we can
always access it (or check that it's NULL).
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation
2026-03-04 15:40 ` Vikash Garodia
@ 2026-03-05 3:41 ` Dmitry Baryshkov
0 siblings, 0 replies; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-05 3:41 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Wed, Mar 04, 2026 at 09:10:33PM +0530, Vikash Garodia wrote:
>
> On 3/4/2026 3:58 AM, Dmitry Baryshkov wrote:
> > On Wed, Mar 04, 2026 at 12:18:58AM +0530, Vikash Garodia wrote:
> > >
> > > On 2/28/2026 1:58 AM, Dmitry Baryshkov wrote:
> > > > On Fri, Feb 27, 2026 at 07:41:22PM +0530, Vikash Garodia wrote:
> > > > > The H265 decoder line buffer size calculation for iris4 (VPU4) was
> > > > > previously reusing the iris3 formula. While this works for most
> > > > > resolutions, certain configurations require a larger buffer size on
> > > > > iris4, causing firmware errors during decode. This resolves firmware
> > > > > failures seen with specific test vectors on kaanapali (iris4), and fixes
> > > > > the following failing fluster tests
> > > > > - PICSIZE_C_Bossen_1
> > > > > - WPP_E_ericsson_MAIN_2
> > > >
> > > > This reminds me of the commit fixing SC7280 support. Should SC7280 or
> > > > all VPU2.0 platforms also use separate formula?
> > > >
> > > for vpu2, there is already a separate formula
> >
> > It was more of "do we need separate formulas within vpu2".
>
> vpu2/3 uses the same one currently here [1].
>
> vpu4 seems to be using quite a different formula to consider it within
> vpu2/3.
>
> [1]https://elixir.bootlin.com/linux/v6.19.3/source/drivers/media/platform/qcom/iris/iris_vpu_buffer.c#L313
Ack
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding
2026-03-04 15:07 ` Krzysztof Kozlowski
@ 2026-03-05 12:23 ` Vikash Garodia
0 siblings, 0 replies; 47+ messages in thread
From: Vikash Garodia @ 2026-03-05 12:23 UTC (permalink / raw)
To: Krzysztof Kozlowski, Dikshita Agarwal, Abhinav Kumar,
Bryan O'Donoghue, Mauro Carvalho Chehab, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Saravana Kannan, Joerg Roedel,
Will Deacon, Robin Murphy, Stefan Schmidt, Hans Verkuil,
Vishnu Reddy, Hans Verkuil
Cc: linux-arm-msm, linux-media, devicetree, linux-kernel, iommu,
Bryan O'Donoghue
On 3/4/2026 8:37 PM, Krzysztof Kozlowski wrote:
> On 03/03/2026 19:10, Vikash Garodia wrote:
>>
>>>
>>> ...
>>>
>>>> + };
>>>> diff --git a/include/dt-bindings/media/qcom,iris.h b/include/dt-bindings/media/qcom,iris.h
>>>
>>> Filename must match binding/compatible. I asked for this multiple times.
>>>
>>
>> in this case, its applicable for other platforms as well. Naming it as
>> qcom,kaanapali-iris.h would make it look like kaanapali specific.
>
> I repeated that feedback way too many times.
thanks for the feedback. I’ll fix this in next revision.
>
> NAK
>
> Nacked-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com
>
> Best regards,
> Krzysztof
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-03 22:25 ` Dmitry Baryshkov
@ 2026-03-05 12:49 ` Vikash Garodia
2026-03-05 14:21 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-05 12:49 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 3/4/2026 3:55 AM, Dmitry Baryshkov wrote:
> On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
>>
>> On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
>>> On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
>>>> Introduce different context banks(CB) and the associated buffer region.
>>>> Different stream IDs from VPU would be associated to one of these CB.
>>>> Multiple CBs are needed to increase the IOVA for the video usecases like
>>>> higher concurrent sessions.
>>>>
>>>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>>>> ---
>>>> .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
>>>> drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
>>>> drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
>>>> drivers/media/platform/qcom/iris/iris_resources.h | 1 +
>>>> 4 files changed, 111 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>> index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
>>>> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>> @@ -204,6 +204,22 @@ struct icc_vote_data {
>>>> u32 fps;
>>>> };
>>>> +enum iris_buffer_region {
>>>> + IRIS_BITSTREAM_REGION = BIT(0),
>>>> + IRIS_NON_PIXEL_REGION = BIT(1),
>>>> + IRIS_PIXEL_REGION = BIT(2),
>>>> + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
>>>> + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
>>>> + IRIS_SECURE_PIXEL_REGION = BIT(5),
>>>
>>> Can a context bank belong to multiple regions at the same time?
>>
>> yes, they would.
>
> How? Each set of CBs is defined by a separate function in the DT. How
> can CB belong to multiple regions? Could you please provide an example?
SM8550 would have same stream id for VPU hardwares (tensilica and
vcodec) accessing bitstream and non pixel regions. Thereby non_pixel and
bitstream regions would map to one CB.
While kaanapali would have different stream id for tensilica accessing
non pixel region and vcodec accessing bitstream region, thereby having
different CB.
>
>>
>>>
>>>> +};
>>>> +
>>>> +struct iris_context_bank {
>>>> + struct device *dev;
>>>
>>> Separate data and the actual device. Define a wrapper around struct
>>> device for the actual runtime usage.
>>
>> we still have to store the list of dynamically created device. Name can be
>> used to fetch the device from the list, i think the existing approach is
>> simpler ?
>
> You don't need a list. You have an array of the size, which is known and
> fixed. You have at most 9 functions, which means less than 9 devices.
>
as mentioned above, its not the same for all platforms to have one to
one mapping between CBs and buffer region. Thereby indexing based on
array would be an issue here
It would end up something like this, considering [dev region] array,
SM8550
non_pixel_device non_pixel_region
non_pixel_device bitstream_region
pixel_device pixel_region
kaanapali
non_pixel_device non_pixel_region
bitstream_device bitstream_region
pixel_device pixel_region
>>
>>>
>>>> + const char *name;
>>>> + const u32 f_id;
>>>> + const enum iris_buffer_region region;
>>>> +};
>>>> +
>>>> enum platform_pm_domain_type {
>>>> IRIS_CTRL_POWER_DOMAIN,
>>>> IRIS_HW_POWER_DOMAIN,
>>>> @@ -246,6 +262,8 @@ struct iris_platform_data {
>>>> u32 inst_fw_caps_enc_size;
>>>> const struct tz_cp_config *tz_cp_config_data;
>>>> u32 tz_cp_config_data_size;
>>>> + struct iris_context_bank *cb_data;
>>>> + u32 cb_data_size;
>>>
>>> Do they differ from platform to platform?
>> Yes
>>
>>> Mark them as const, it should be data only.
>>
>> cb_data_size can be marked as const
>
> Why is cb_data non-const?
dev is being updated once created dynamically.
>
>>
>>>
>>>> u32 core_arch;
>>>> u32 hw_response_timeout;
>>>> struct ubwc_config_data *ubwc_config;
>>>> diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
>>>> index ddaacda523ecb9990af0dd0640196223fbcc2cab..557adb038328a75510591d91569819abc0b7b1c9 100644
>>>> --- a/drivers/media/platform/qcom/iris/iris_probe.c
>>>> +++ b/drivers/media/platform/qcom/iris/iris_probe.c
>>>> @@ -123,6 +123,49 @@ static int iris_init_resets(struct iris_core *core)
>>>> core->iris_platform_data->controller_rst_tbl_size);
>>>> }
>>>> +static void iris_destroy_child_device(struct iris_context_bank *cb)
>>>> +{
>>>> + struct device *dev = cb->dev;
>>>> +
>>>> + if (dev)
>>>> + device_unregister(dev);
>>>> +
>>>> + cb->dev = NULL;
>>>> +}
>>>> +
>>>> +static void iris_deinit_context_bank_devices(struct iris_core *core)
>>>> +{
>>>> + struct iris_context_bank *cb;
>>>> + int i;
>>>> +
>>>> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
>>>> + cb = &core->iris_platform_data->cb_data[i];
>>>> + iris_destroy_child_device(cb);
>>>> + }
>>>> +}
>>>> +
>>>> +static int iris_init_context_bank_devices(struct iris_core *core)
>>>> +{
>>>> + struct iris_context_bank *cb;
>>>> + int ret, i;
>>>> +
>>>> + for (i = 0; i < core->iris_platform_data->cb_data_size; i++) {
>>>> + cb = &core->iris_platform_data->cb_data[i];
>>>> +
>>>> + ret = iris_create_child_device_and_map(core, cb);
>>>> + if (ret)
>>>> + goto err_deinit_cb;
>>>> + }
>>>> +
>>>> + return 0;
>>>> +
>>>> +err_deinit_cb:
>>>> + while (i-- > 0)
>>>> + iris_destroy_child_device(&core->iris_platform_data->cb_data[i]);
>>>> +
>>>> + return ret;
>>>> +}
>>>> +
>>>> static int iris_init_resources(struct iris_core *core)
>>>> {
>>>> int ret;
>>>> @@ -193,6 +236,7 @@ static void iris_remove(struct platform_device *pdev)
>>>> return;
>>>> iris_core_deinit(core);
>>>> + iris_deinit_context_bank_devices(core);
>>>> video_unregister_device(core->vdev_dec);
>>>> video_unregister_device(core->vdev_enc);
>>>> @@ -275,12 +319,18 @@ static int iris_probe(struct platform_device *pdev)
>>>> platform_set_drvdata(pdev, core);
>>>> - dma_mask = core->iris_platform_data->dma_mask;
>>>> -
>>>> - ret = dma_set_mask_and_coherent(dev, dma_mask);
>>>> + ret = iris_init_context_bank_devices(core);
>>>> if (ret)
>>>> goto err_vdev_unreg_enc;
>>>> + dma_mask = core->iris_platform_data->dma_mask;
>>>> +
>>>> + if (device_iommu_mapped(core->dev)) {
>>>> + ret = dma_set_mask_and_coherent(core->dev, dma_mask);
>>>> + if (ret)
>>>> + goto err_deinit_cb;
>>>> + }
>>>> +
>>>> dma_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
>>>> dma_set_seg_boundary(&pdev->dev, DMA_BIT_MASK(32));
>>>> @@ -288,10 +338,12 @@ static int iris_probe(struct platform_device *pdev)
>>>> pm_runtime_use_autosuspend(core->dev);
>>>> ret = devm_pm_runtime_enable(core->dev);
>>>> if (ret)
>>>> - goto err_vdev_unreg_enc;
>>>> + goto err_deinit_cb;
>>>> return 0;
>>>> +err_deinit_cb:
>>>> + iris_deinit_context_bank_devices(core);
>>>> err_vdev_unreg_enc:
>>>> video_unregister_device(core->vdev_enc);
>>>> err_vdev_unreg_dec:
>>>> diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/media/platform/qcom/iris/iris_resources.c
>>>> index 773f6548370a257b8ae7332242544266cbbd61a9..be58e8620086d0f82c2c2bda29247483f5c56d79 100644
>>>> --- a/drivers/media/platform/qcom/iris/iris_resources.c
>>>> +++ b/drivers/media/platform/qcom/iris/iris_resources.c
>>>> @@ -6,6 +6,7 @@
>>>> #include <linux/clk.h>
>>>> #include <linux/devfreq.h>
>>>> #include <linux/interconnect.h>
>>>> +#include <linux/iris_vpu_bus.h>
>>>> #include <linux/pm_domain.h>
>>>> #include <linux/pm_opp.h>
>>>> #include <linux/pm_runtime.h>
>>>> @@ -141,3 +142,38 @@ int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type
>>>> return 0;
>>>> }
>>>> +
>>>> +static void iris_device_release(struct device *dev)
>>>> +{
>>>> + dev_set_drvdata(dev, NULL);
>>>> + kfree(dev);
>>>> +}
>>>> +
>>>> +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb)
>>>> +{
>>>> + struct device *dev;
>>>> + int ret;
>>>> +
>>>> + dev = kzalloc_obj(*dev);
>>>> + if (!dev)
>>>> + return -ENOMEM;
>>>> +
>>>> + dev->release = iris_device_release;
>>>> + dev->bus = &iris_vpu_bus_type;
>>>> + dev->parent = core->dev;
>>>> + dev->coherent_dma_mask = core->iris_platform_data->dma_mask;
>>>> + dev->dma_mask = &dev->coherent_dma_mask;
>>>> +
>>>> + dev_set_name(dev, "%s", cb->name);
>>>> + dev_set_drvdata(dev, cb);
>>>> +
>>>> + ret = device_register(dev);
>>>> + if (ret) {
>>>> + put_device(dev);
>>>> + return ret;
>>>> + }
>>>> +
>>>> + cb->dev = dev;
>>>> +
>>>> + return 0;
>>>> +}
>>>> diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/media/platform/qcom/iris/iris_resources.h
>>>> index 6bfbd2dc6db095ec05e53c894e048285f82446c6..b7efe15facb203eea9ae13d5f0abdcc2ea718b4d 100644
>>>> --- a/drivers/media/platform/qcom/iris/iris_resources.h
>>>> +++ b/drivers/media/platform/qcom/iris/iris_resources.h
>>>> @@ -15,5 +15,6 @@ int iris_unset_icc_bw(struct iris_core *core);
>>>> int iris_set_icc_bw(struct iris_core *core, unsigned long icc_bw);
>>>> int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk_type clk_type);
>>>> int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_type clk_type);
>>>> +int iris_create_child_device_and_map(struct iris_core *core, struct iris_context_bank *cb);
>>>> #endif
>>>>
>>>> --
>>>> 2.34.1
>>>>
>>>
>>
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-05 12:49 ` Vikash Garodia
@ 2026-03-05 14:21 ` Dmitry Baryshkov
2026-03-05 17:26 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-05 14:21 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Thu, Mar 05, 2026 at 06:19:52PM +0530, Vikash Garodia wrote:
>
> On 3/4/2026 3:55 AM, Dmitry Baryshkov wrote:
> > On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
> > >
> > > On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
> > > > On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
> > > > > Introduce different context banks(CB) and the associated buffer region.
> > > > > Different stream IDs from VPU would be associated to one of these CB.
> > > > > Multiple CBs are needed to increase the IOVA for the video usecases like
> > > > > higher concurrent sessions.
> > > > >
> > > > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > > > ---
> > > > > .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
> > > > > drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
> > > > > drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
> > > > > drivers/media/platform/qcom/iris/iris_resources.h | 1 +
> > > > > 4 files changed, 111 insertions(+), 4 deletions(-)
> > > > >
> > > > > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
> > > > > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > @@ -204,6 +204,22 @@ struct icc_vote_data {
> > > > > u32 fps;
> > > > > };
> > > > > +enum iris_buffer_region {
> > > > > + IRIS_BITSTREAM_REGION = BIT(0),
> > > > > + IRIS_NON_PIXEL_REGION = BIT(1),
> > > > > + IRIS_PIXEL_REGION = BIT(2),
> > > > > + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
> > > > > + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
> > > > > + IRIS_SECURE_PIXEL_REGION = BIT(5),
> > > >
> > > > Can a context bank belong to multiple regions at the same time?
> > >
> > > yes, they would.
> >
> > How? Each set of CBs is defined by a separate function in the DT. How
> > can CB belong to multiple regions? Could you please provide an example?
>
> SM8550 would have same stream id for VPU hardwares (tensilica and vcodec)
> accessing bitstream and non pixel regions. Thereby non_pixel and bitstream
> regions would map to one CB.
In my opinion it means only one thing: you will have two CBs (one for
non_pixel and one for bitstream) having the same SIDs. An alternative
would be to define fallback rules (if CB foo doesn't exist, use CB bar).
> While kaanapali would have different stream id for tensilica accessing non
> pixel region and vcodec accessing bitstream region, thereby having different
> CB.
>
> >
> > >
> > > >
> > > > > +};
> > > > > +
> > > > > +struct iris_context_bank {
> > > > > + struct device *dev;
> > > >
> > > > Separate data and the actual device. Define a wrapper around struct
> > > > device for the actual runtime usage.
> > >
> > > we still have to store the list of dynamically created device. Name can be
> > > used to fetch the device from the list, i think the existing approach is
> > > simpler ?
> >
> > You don't need a list. You have an array of the size, which is known and
> > fixed. You have at most 9 functions, which means less than 9 devices.
> >
>
> as mentioned above, its not the same for all platforms to have one to one
> mapping between CBs and buffer region. Thereby indexing based on array would
> be an issue here
> It would end up something like this, considering [dev region] array,
>
> SM8550
> non_pixel_device non_pixel_region
> non_pixel_device bitstream_region
> pixel_device pixel_region
>
> kaanapali
> non_pixel_device non_pixel_region
> bitstream_device bitstream_region
> pixel_device pixel_region
I'm sorry, I'm not sure I follow here. Could you please explain? Maybe
by explititly mapping DT function values to iris_buffer_region values?
>
>
> > >
> > > >
> > > > > + const char *name;
> > > > > + const u32 f_id;
> > > > > + const enum iris_buffer_region region;
> > > > > +};
> > > > > +
> > > > > enum platform_pm_domain_type {
> > > > > IRIS_CTRL_POWER_DOMAIN,
> > > > > IRIS_HW_POWER_DOMAIN,
> > > > > @@ -246,6 +262,8 @@ struct iris_platform_data {
> > > > > u32 inst_fw_caps_enc_size;
> > > > > const struct tz_cp_config *tz_cp_config_data;
> > > > > u32 tz_cp_config_data_size;
> > > > > + struct iris_context_bank *cb_data;
> > > > > + u32 cb_data_size;
> > > >
> > > > Do they differ from platform to platform?
> > > Yes
> > >
> > > > Mark them as const, it should be data only.
> > >
> > > cb_data_size can be marked as const
> >
> > Why is cb_data non-const?
>
> dev is being updated once created dynamically.
That's a bad idea. Please make the platform description constant.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-05 14:21 ` Dmitry Baryshkov
@ 2026-03-05 17:26 ` Vikash Garodia
2026-03-05 18:32 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-05 17:26 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 3/5/2026 7:51 PM, Dmitry Baryshkov wrote:
> On Thu, Mar 05, 2026 at 06:19:52PM +0530, Vikash Garodia wrote:
>>
>> On 3/4/2026 3:55 AM, Dmitry Baryshkov wrote:
>>> On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
>>>>
>>>> On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
>>>>> On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
>>>>>> Introduce different context banks(CB) and the associated buffer region.
>>>>>> Different stream IDs from VPU would be associated to one of these CB.
>>>>>> Multiple CBs are needed to increase the IOVA for the video usecases like
>>>>>> higher concurrent sessions.
>>>>>>
>>>>>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>>>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>>>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>>>>>> ---
>>>>>> .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
>>>>>> drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
>>>>>> drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
>>>>>> drivers/media/platform/qcom/iris/iris_resources.h | 1 +
>>>>>> 4 files changed, 111 insertions(+), 4 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>>>> index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
>>>>>> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>>>> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>>>> @@ -204,6 +204,22 @@ struct icc_vote_data {
>>>>>> u32 fps;
>>>>>> };
>>>>>> +enum iris_buffer_region {
>>>>>> + IRIS_BITSTREAM_REGION = BIT(0),
>>>>>> + IRIS_NON_PIXEL_REGION = BIT(1),
>>>>>> + IRIS_PIXEL_REGION = BIT(2),
>>>>>> + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
>>>>>> + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
>>>>>> + IRIS_SECURE_PIXEL_REGION = BIT(5),
>>>>>
>>>>> Can a context bank belong to multiple regions at the same time?
>>>>
>>>> yes, they would.
>>>
>>> How? Each set of CBs is defined by a separate function in the DT. How
>>> can CB belong to multiple regions? Could you please provide an example?
>>
>> SM8550 would have same stream id for VPU hardwares (tensilica and vcodec)
>> accessing bitstream and non pixel regions. Thereby non_pixel and bitstream
>> regions would map to one CB.
>
> In my opinion it means only one thing: you will have two CBs (one for
> non_pixel and one for bitstream) having the same SIDs. An alternative
> would be to define fallback rules (if CB foo doesn't exist, use CB bar).
>
>> While kaanapali would have different stream id for tensilica accessing non
>> pixel region and vcodec accessing bitstream region, thereby having different
>> CB.
>>
>>>
>>>>
>>>>>
>>>>>> +};
>>>>>> +
>>>>>> +struct iris_context_bank {
>>>>>> + struct device *dev;
>>>>>
>>>>> Separate data and the actual device. Define a wrapper around struct
>>>>> device for the actual runtime usage.
>>>>
>>>> we still have to store the list of dynamically created device. Name can be
>>>> used to fetch the device from the list, i think the existing approach is
>>>> simpler ?
>>>
>>> You don't need a list. You have an array of the size, which is known and
>>> fixed. You have at most 9 functions, which means less than 9 devices.
>>>
>>
>> as mentioned above, its not the same for all platforms to have one to one
>> mapping between CBs and buffer region. Thereby indexing based on array would
>> be an issue here
>> It would end up something like this, considering [dev region] array,
>>
>> SM8550
>> non_pixel_device non_pixel_region
>> non_pixel_device bitstream_region
>> pixel_device pixel_region
>>
>> kaanapali
>> non_pixel_device non_pixel_region
>> bitstream_device bitstream_region
>> pixel_device pixel_region
>
> I'm sorry, I'm not sure I follow here. Could you please explain? Maybe
> by explititly mapping DT function values to iris_buffer_region values?
>
Kaanapali
IRIS_BITSTREAM IRIS_BITSTREAM_REGION
IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION
IRIS_PIXEL IRIS_PIXEL_REGION
SM8550
IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION | IRIS_BITSTREAM_REGION
IRIS_PIXEL IRIS_PIXEL_REGION
>>
>>
>>>>
>>>>>
>>>>>> + const char *name;
>>>>>> + const u32 f_id;
>>>>>> + const enum iris_buffer_region region;
>>>>>> +};
>>>>>> +
>>>>>> enum platform_pm_domain_type {
>>>>>> IRIS_CTRL_POWER_DOMAIN,
>>>>>> IRIS_HW_POWER_DOMAIN,
>>>>>> @@ -246,6 +262,8 @@ struct iris_platform_data {
>>>>>> u32 inst_fw_caps_enc_size;
>>>>>> const struct tz_cp_config *tz_cp_config_data;
>>>>>> u32 tz_cp_config_data_size;
>>>>>> + struct iris_context_bank *cb_data;
>>>>>> + u32 cb_data_size;
>>>>>
>>>>> Do they differ from platform to platform?
>>>> Yes
>>>>
>>>>> Mark them as const, it should be data only.
>>>>
>>>> cb_data_size can be marked as const
>>>
>>> Why is cb_data non-const?
>>
>> dev is being updated once created dynamically.
>
> That's a bad idea. Please make the platform description constant.
>
I can give it a try to move CBs in core struct out of platform data and
have a buffer region based lookup array to fetch the device.
Regards,
Vikash
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-05 17:26 ` Vikash Garodia
@ 2026-03-05 18:32 ` Dmitry Baryshkov
2026-03-05 21:34 ` Vikash Garodia
0 siblings, 1 reply; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-05 18:32 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Thu, Mar 05, 2026 at 10:56:40PM +0530, Vikash Garodia wrote:
>
> On 3/5/2026 7:51 PM, Dmitry Baryshkov wrote:
> > On Thu, Mar 05, 2026 at 06:19:52PM +0530, Vikash Garodia wrote:
> > >
> > > On 3/4/2026 3:55 AM, Dmitry Baryshkov wrote:
> > > > On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
> > > > >
> > > > > On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
> > > > > > On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
> > > > > > > Introduce different context banks(CB) and the associated buffer region.
> > > > > > > Different stream IDs from VPU would be associated to one of these CB.
> > > > > > > Multiple CBs are needed to increase the IOVA for the video usecases like
> > > > > > > higher concurrent sessions.
> > > > > > >
> > > > > > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > > > > > ---
> > > > > > > .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
> > > > > > > drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
> > > > > > > drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
> > > > > > > drivers/media/platform/qcom/iris/iris_resources.h | 1 +
> > > > > > > 4 files changed, 111 insertions(+), 4 deletions(-)
> > > > > > >
> > > > > > > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > > > index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
> > > > > > > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > > > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > > > @@ -204,6 +204,22 @@ struct icc_vote_data {
> > > > > > > u32 fps;
> > > > > > > };
> > > > > > > +enum iris_buffer_region {
> > > > > > > + IRIS_BITSTREAM_REGION = BIT(0),
> > > > > > > + IRIS_NON_PIXEL_REGION = BIT(1),
> > > > > > > + IRIS_PIXEL_REGION = BIT(2),
> > > > > > > + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
> > > > > > > + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
> > > > > > > + IRIS_SECURE_PIXEL_REGION = BIT(5),
> > > > > >
> > > > > > Can a context bank belong to multiple regions at the same time?
> > > > >
> > > > > yes, they would.
> > > >
> > > > How? Each set of CBs is defined by a separate function in the DT. How
> > > > can CB belong to multiple regions? Could you please provide an example?
> > >
> > > SM8550 would have same stream id for VPU hardwares (tensilica and vcodec)
> > > accessing bitstream and non pixel regions. Thereby non_pixel and bitstream
> > > regions would map to one CB.
> >
> > In my opinion it means only one thing: you will have two CBs (one for
> > non_pixel and one for bitstream) having the same SIDs. An alternative
> > would be to define fallback rules (if CB foo doesn't exist, use CB bar).
> >
> > > While kaanapali would have different stream id for tensilica accessing non
> > > pixel region and vcodec accessing bitstream region, thereby having different
> > > CB.
> > >
> > > >
> > > > >
> > > > > >
> > > > > > > +};
> > > > > > > +
> > > > > > > +struct iris_context_bank {
> > > > > > > + struct device *dev;
> > > > > >
> > > > > > Separate data and the actual device. Define a wrapper around struct
> > > > > > device for the actual runtime usage.
> > > > >
> > > > > we still have to store the list of dynamically created device. Name can be
> > > > > used to fetch the device from the list, i think the existing approach is
> > > > > simpler ?
> > > >
> > > > You don't need a list. You have an array of the size, which is known and
> > > > fixed. You have at most 9 functions, which means less than 9 devices.
> > > >
> > >
> > > as mentioned above, its not the same for all platforms to have one to one
> > > mapping between CBs and buffer region. Thereby indexing based on array would
> > > be an issue here
> > > It would end up something like this, considering [dev region] array,
> > >
> > > SM8550
> > > non_pixel_device non_pixel_region
> > > non_pixel_device bitstream_region
> > > pixel_device pixel_region
> > >
> > > kaanapali
> > > non_pixel_device non_pixel_region
> > > bitstream_device bitstream_region
> > > pixel_device pixel_region
> >
> > I'm sorry, I'm not sure I follow here. Could you please explain? Maybe
> > by explititly mapping DT function values to iris_buffer_region values?
> >
>
> Kaanapali
> IRIS_BITSTREAM IRIS_BITSTREAM_REGION
> IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION
> IRIS_PIXEL IRIS_PIXEL_REGION
>
> SM8550
> IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION | IRIS_BITSTREAM_REGION
> IRIS_PIXEL IRIS_PIXEL_REGION
So, why not:
Kaanapali:
iris_cb_dev_bs = iris_cb_dev_alloc(IRIS_BITSTREAM];
iris_cb_dev_np = iris_cb_dev_alloc(IRIS_NON_PIXEL];
iris_cb_dev_px = iris_cb_dev_alloc(IRIS_PIXEL];
core->cb_devs = {
[IRIS_BITSTREAM_REGION] = iris_cb_dev_bs,
[IRIS_NON_PIXEL_REGION] = iris_cb_dev_np,
[IRIS_PIXEL_REGION] = iris_cb_dev_px;
};
SM8550:
iris_cb_dev_np = iris_cb_dev_alloc(IRIS_NON_PIXEL];
iris_cb_dev_px = iris_cb_dev_alloc(IRIS_PIXEL];
core->cb_devs = {
[IRIS_BITSTREAM_REGION] = iris_cb_dev_np,
[IRIS_NON_PIXEL_REGION] = iris_cb_dev_np,
[IRIS_PIXEL_REGION] = iris_cb_dev_px;
};
Yes, it would require coding of those functions, however afterwards you
can access necessary CB device simply by doing core->cb_devs[region].
I think current code is overcomplicated for the sake of having the
platform flexibility expressed as data.
>
> > >
> > >
> > > > >
> > > > > >
> > > > > > > + const char *name;
> > > > > > > + const u32 f_id;
> > > > > > > + const enum iris_buffer_region region;
> > > > > > > +};
> > > > > > > +
> > > > > > > enum platform_pm_domain_type {
> > > > > > > IRIS_CTRL_POWER_DOMAIN,
> > > > > > > IRIS_HW_POWER_DOMAIN,
> > > > > > > @@ -246,6 +262,8 @@ struct iris_platform_data {
> > > > > > > u32 inst_fw_caps_enc_size;
> > > > > > > const struct tz_cp_config *tz_cp_config_data;
> > > > > > > u32 tz_cp_config_data_size;
> > > > > > > + struct iris_context_bank *cb_data;
> > > > > > > + u32 cb_data_size;
> > > > > >
> > > > > > Do they differ from platform to platform?
> > > > > Yes
> > > > >
> > > > > > Mark them as const, it should be data only.
> > > > >
> > > > > cb_data_size can be marked as const
> > > >
> > > > Why is cb_data non-const?
> > >
> > > dev is being updated once created dynamically.
> >
> > That's a bad idea. Please make the platform description constant.
> >
>
> I can give it a try to move CBs in core struct out of platform data and have
> a buffer region based lookup array to fetch the device.
It might be easier to express that as a callback, filling core->cb_devs
with struct device pointers, as I wrote above.
>
> Regards,
> Vikash
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-05 18:32 ` Dmitry Baryshkov
@ 2026-03-05 21:34 ` Vikash Garodia
2026-03-13 19:26 ` Dmitry Baryshkov
0 siblings, 1 reply; 47+ messages in thread
From: Vikash Garodia @ 2026-03-05 21:34 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On 3/6/2026 12:02 AM, Dmitry Baryshkov wrote:
> On Thu, Mar 05, 2026 at 10:56:40PM +0530, Vikash Garodia wrote:
>>
>> On 3/5/2026 7:51 PM, Dmitry Baryshkov wrote:
>>> On Thu, Mar 05, 2026 at 06:19:52PM +0530, Vikash Garodia wrote:
>>>>
>>>> On 3/4/2026 3:55 AM, Dmitry Baryshkov wrote:
>>>>> On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
>>>>>>
>>>>>> On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
>>>>>>> On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
>>>>>>>> Introduce different context banks(CB) and the associated buffer region.
>>>>>>>> Different stream IDs from VPU would be associated to one of these CB.
>>>>>>>> Multiple CBs are needed to increase the IOVA for the video usecases like
>>>>>>>> higher concurrent sessions.
>>>>>>>>
>>>>>>>> Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>>>>>> Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
>>>>>>>> Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
>>>>>>>> ---
>>>>>>>> .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
>>>>>>>> drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
>>>>>>>> drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
>>>>>>>> drivers/media/platform/qcom/iris/iris_resources.h | 1 +
>>>>>>>> 4 files changed, 111 insertions(+), 4 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>>>>>> index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
>>>>>>>> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>>>>>> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
>>>>>>>> @@ -204,6 +204,22 @@ struct icc_vote_data {
>>>>>>>> u32 fps;
>>>>>>>> };
>>>>>>>> +enum iris_buffer_region {
>>>>>>>> + IRIS_BITSTREAM_REGION = BIT(0),
>>>>>>>> + IRIS_NON_PIXEL_REGION = BIT(1),
>>>>>>>> + IRIS_PIXEL_REGION = BIT(2),
>>>>>>>> + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
>>>>>>>> + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
>>>>>>>> + IRIS_SECURE_PIXEL_REGION = BIT(5),
>>>>>>>
>>>>>>> Can a context bank belong to multiple regions at the same time?
>>>>>>
>>>>>> yes, they would.
>>>>>
>>>>> How? Each set of CBs is defined by a separate function in the DT. How
>>>>> can CB belong to multiple regions? Could you please provide an example?
>>>>
>>>> SM8550 would have same stream id for VPU hardwares (tensilica and vcodec)
>>>> accessing bitstream and non pixel regions. Thereby non_pixel and bitstream
>>>> regions would map to one CB.
>>>
>>> In my opinion it means only one thing: you will have two CBs (one for
>>> non_pixel and one for bitstream) having the same SIDs. An alternative
>>> would be to define fallback rules (if CB foo doesn't exist, use CB bar).
>>>
>>>> While kaanapali would have different stream id for tensilica accessing non
>>>> pixel region and vcodec accessing bitstream region, thereby having different
>>>> CB.
>>>>
>>>>>
>>>>>>
>>>>>>>
>>>>>>>> +};
>>>>>>>> +
>>>>>>>> +struct iris_context_bank {
>>>>>>>> + struct device *dev;
>>>>>>>
>>>>>>> Separate data and the actual device. Define a wrapper around struct
>>>>>>> device for the actual runtime usage.
>>>>>>
>>>>>> we still have to store the list of dynamically created device. Name can be
>>>>>> used to fetch the device from the list, i think the existing approach is
>>>>>> simpler ?
>>>>>
>>>>> You don't need a list. You have an array of the size, which is known and
>>>>> fixed. You have at most 9 functions, which means less than 9 devices.
>>>>>
>>>>
>>>> as mentioned above, its not the same for all platforms to have one to one
>>>> mapping between CBs and buffer region. Thereby indexing based on array would
>>>> be an issue here
>>>> It would end up something like this, considering [dev region] array,
>>>>
>>>> SM8550
>>>> non_pixel_device non_pixel_region
>>>> non_pixel_device bitstream_region
>>>> pixel_device pixel_region
>>>>
>>>> kaanapali
>>>> non_pixel_device non_pixel_region
>>>> bitstream_device bitstream_region
>>>> pixel_device pixel_region
>>>
>>> I'm sorry, I'm not sure I follow here. Could you please explain? Maybe
>>> by explititly mapping DT function values to iris_buffer_region values?
>>>
>>
>> Kaanapali
>> IRIS_BITSTREAM IRIS_BITSTREAM_REGION
>> IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION
>> IRIS_PIXEL IRIS_PIXEL_REGION
>>
>> SM8550
>> IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION | IRIS_BITSTREAM_REGION
>> IRIS_PIXEL IRIS_PIXEL_REGION
>
> So, why not:
>
> Kaanapali:
>
> iris_cb_dev_bs = iris_cb_dev_alloc(IRIS_BITSTREAM];
> iris_cb_dev_np = iris_cb_dev_alloc(IRIS_NON_PIXEL];
> iris_cb_dev_px = iris_cb_dev_alloc(IRIS_PIXEL];
>
> core->cb_devs = {
> [IRIS_BITSTREAM_REGION] = iris_cb_dev_bs,
> [IRIS_NON_PIXEL_REGION] = iris_cb_dev_np,
> [IRIS_PIXEL_REGION] = iris_cb_dev_px;
> };
>
> SM8550:
>
> iris_cb_dev_np = iris_cb_dev_alloc(IRIS_NON_PIXEL];
> iris_cb_dev_px = iris_cb_dev_alloc(IRIS_PIXEL];
>
> core->cb_devs = {
> [IRIS_BITSTREAM_REGION] = iris_cb_dev_np,
> [IRIS_NON_PIXEL_REGION] = iris_cb_dev_np,
> [IRIS_PIXEL_REGION] = iris_cb_dev_px;
> };
>
>
> Yes, it would require coding of those functions, however afterwards you
> can access necessary CB device simply by doing core->cb_devs[region].
>
> I think current code is overcomplicated for the sake of having the
> platform flexibility expressed as data.
>
>>
>>>>
>>>>
>>>>>>
>>>>>>>
>>>>>>>> + const char *name;
>>>>>>>> + const u32 f_id;
>>>>>>>> + const enum iris_buffer_region region;
>>>>>>>> +};
>>>>>>>> +
>>>>>>>> enum platform_pm_domain_type {
>>>>>>>> IRIS_CTRL_POWER_DOMAIN,
>>>>>>>> IRIS_HW_POWER_DOMAIN,
>>>>>>>> @@ -246,6 +262,8 @@ struct iris_platform_data {
>>>>>>>> u32 inst_fw_caps_enc_size;
>>>>>>>> const struct tz_cp_config *tz_cp_config_data;
>>>>>>>> u32 tz_cp_config_data_size;
>>>>>>>> + struct iris_context_bank *cb_data;
>>>>>>>> + u32 cb_data_size;
>>>>>>>
>>>>>>> Do they differ from platform to platform?
>>>>>> Yes
>>>>>>
>>>>>>> Mark them as const, it should be data only.
>>>>>>
>>>>>> cb_data_size can be marked as const
>>>>>
>>>>> Why is cb_data non-const?
>>>>
>>>> dev is being updated once created dynamically.
>>>
>>> That's a bad idea. Please make the platform description constant.
>>>
>>
>> I can give it a try to move CBs in core struct out of platform data and have
>> a buffer region based lookup array to fetch the device.
>
> It might be easier to express that as a callback, filling core->cb_devs
> with struct device pointers, as I wrote above.
IIUC, introduce an ops like below and fill ore->cb_devs[] in SOC
specific data i.e sm8550_data ?
struct iris_platform_ops {
int (*populate_cb_devs)(struct iris_core *core);
};
struct iris_platform_data {
const struct iris_platform_ops *ops;
/* ... other pdata fields ... */
};
At present lemans shares the platform data of sm8550, with the above ops
approach, that commonality leverage would be lost ?
Please correct if your proposal is different than what i interpreted.
>
>>
>> Regards,
>> Vikash
>
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 4/7] media: iris: add context bank devices using iommu-map
2026-03-05 21:34 ` Vikash Garodia
@ 2026-03-13 19:26 ` Dmitry Baryshkov
0 siblings, 0 replies; 47+ messages in thread
From: Dmitry Baryshkov @ 2026-03-13 19:26 UTC (permalink / raw)
To: Vikash Garodia
Cc: Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue,
Mauro Carvalho Chehab, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Saravana Kannan, Joerg Roedel, Will Deacon,
Robin Murphy, Stefan Schmidt, Hans Verkuil, Krzysztof Kozlowski,
Vishnu Reddy, Hans Verkuil, linux-arm-msm, linux-media,
devicetree, linux-kernel, iommu, Bryan O'Donoghue
On Fri, Mar 06, 2026 at 03:04:04AM +0530, Vikash Garodia wrote:
>
> On 3/6/2026 12:02 AM, Dmitry Baryshkov wrote:
> > On Thu, Mar 05, 2026 at 10:56:40PM +0530, Vikash Garodia wrote:
> > >
> > > On 3/5/2026 7:51 PM, Dmitry Baryshkov wrote:
> > > > On Thu, Mar 05, 2026 at 06:19:52PM +0530, Vikash Garodia wrote:
> > > > >
> > > > > On 3/4/2026 3:55 AM, Dmitry Baryshkov wrote:
> > > > > > On Wed, Mar 04, 2026 at 12:16:50AM +0530, Vikash Garodia wrote:
> > > > > > >
> > > > > > > On 2/28/2026 1:50 AM, Dmitry Baryshkov wrote:
> > > > > > > > On Fri, Feb 27, 2026 at 07:41:20PM +0530, Vikash Garodia wrote:
> > > > > > > > > Introduce different context banks(CB) and the associated buffer region.
> > > > > > > > > Different stream IDs from VPU would be associated to one of these CB.
> > > > > > > > > Multiple CBs are needed to increase the IOVA for the video usecases like
> > > > > > > > > higher concurrent sessions.
> > > > > > > > >
> > > > > > > > > Co-developed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > > > > > Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
> > > > > > > > > Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
> > > > > > > > > ---
> > > > > > > > > .../platform/qcom/iris/iris_platform_common.h | 18 +++++++
> > > > > > > > > drivers/media/platform/qcom/iris/iris_probe.c | 60 ++++++++++++++++++++--
> > > > > > > > > drivers/media/platform/qcom/iris/iris_resources.c | 36 +++++++++++++
> > > > > > > > > drivers/media/platform/qcom/iris/iris_resources.h | 1 +
> > > > > > > > > 4 files changed, 111 insertions(+), 4 deletions(-)
> > > > > > > > >
> > > > > > > > > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > > > > > index 5a489917580eb10022fdcb52f7321a915e8b239d..03c50d6e54853fca34d7d32f65d09eb80945fcdd 100644
> > > > > > > > > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > > > > > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> > > > > > > > > @@ -204,6 +204,22 @@ struct icc_vote_data {
> > > > > > > > > u32 fps;
> > > > > > > > > };
> > > > > > > > > +enum iris_buffer_region {
> > > > > > > > > + IRIS_BITSTREAM_REGION = BIT(0),
> > > > > > > > > + IRIS_NON_PIXEL_REGION = BIT(1),
> > > > > > > > > + IRIS_PIXEL_REGION = BIT(2),
> > > > > > > > > + IRIS_SECURE_BITSTREAM_REGION = BIT(3),
> > > > > > > > > + IRIS_SECURE_NON_PIXEL_REGION = BIT(4),
> > > > > > > > > + IRIS_SECURE_PIXEL_REGION = BIT(5),
> > > > > > > >
> > > > > > > > Can a context bank belong to multiple regions at the same time?
> > > > > > >
> > > > > > > yes, they would.
> > > > > >
> > > > > > How? Each set of CBs is defined by a separate function in the DT. How
> > > > > > can CB belong to multiple regions? Could you please provide an example?
> > > > >
> > > > > SM8550 would have same stream id for VPU hardwares (tensilica and vcodec)
> > > > > accessing bitstream and non pixel regions. Thereby non_pixel and bitstream
> > > > > regions would map to one CB.
> > > >
> > > > In my opinion it means only one thing: you will have two CBs (one for
> > > > non_pixel and one for bitstream) having the same SIDs. An alternative
> > > > would be to define fallback rules (if CB foo doesn't exist, use CB bar).
> > > >
> > > > > While kaanapali would have different stream id for tensilica accessing non
> > > > > pixel region and vcodec accessing bitstream region, thereby having different
> > > > > CB.
> > > > >
> > > > > >
> > > > > > >
> > > > > > > >
> > > > > > > > > +};
> > > > > > > > > +
> > > > > > > > > +struct iris_context_bank {
> > > > > > > > > + struct device *dev;
> > > > > > > >
> > > > > > > > Separate data and the actual device. Define a wrapper around struct
> > > > > > > > device for the actual runtime usage.
> > > > > > >
> > > > > > > we still have to store the list of dynamically created device. Name can be
> > > > > > > used to fetch the device from the list, i think the existing approach is
> > > > > > > simpler ?
> > > > > >
> > > > > > You don't need a list. You have an array of the size, which is known and
> > > > > > fixed. You have at most 9 functions, which means less than 9 devices.
> > > > > >
> > > > >
> > > > > as mentioned above, its not the same for all platforms to have one to one
> > > > > mapping between CBs and buffer region. Thereby indexing based on array would
> > > > > be an issue here
> > > > > It would end up something like this, considering [dev region] array,
> > > > >
> > > > > SM8550
> > > > > non_pixel_device non_pixel_region
> > > > > non_pixel_device bitstream_region
> > > > > pixel_device pixel_region
> > > > >
> > > > > kaanapali
> > > > > non_pixel_device non_pixel_region
> > > > > bitstream_device bitstream_region
> > > > > pixel_device pixel_region
> > > >
> > > > I'm sorry, I'm not sure I follow here. Could you please explain? Maybe
> > > > by explititly mapping DT function values to iris_buffer_region values?
> > > >
> > >
> > > Kaanapali
> > > IRIS_BITSTREAM IRIS_BITSTREAM_REGION
> > > IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION
> > > IRIS_PIXEL IRIS_PIXEL_REGION
> > >
> > > SM8550
> > > IRIS_NON_PIXEL IRIS_NON_PIXEL_REGION | IRIS_BITSTREAM_REGION
> > > IRIS_PIXEL IRIS_PIXEL_REGION
> >
> > So, why not:
> >
> > Kaanapali:
> >
> > iris_cb_dev_bs = iris_cb_dev_alloc(IRIS_BITSTREAM];
> > iris_cb_dev_np = iris_cb_dev_alloc(IRIS_NON_PIXEL];
> > iris_cb_dev_px = iris_cb_dev_alloc(IRIS_PIXEL];
> >
> > core->cb_devs = {
> > [IRIS_BITSTREAM_REGION] = iris_cb_dev_bs,
> > [IRIS_NON_PIXEL_REGION] = iris_cb_dev_np,
> > [IRIS_PIXEL_REGION] = iris_cb_dev_px;
> > };
> >
> > SM8550:
> >
> > iris_cb_dev_np = iris_cb_dev_alloc(IRIS_NON_PIXEL];
> > iris_cb_dev_px = iris_cb_dev_alloc(IRIS_PIXEL];
> >
> > core->cb_devs = {
> > [IRIS_BITSTREAM_REGION] = iris_cb_dev_np,
> > [IRIS_NON_PIXEL_REGION] = iris_cb_dev_np,
> > [IRIS_PIXEL_REGION] = iris_cb_dev_px;
> > };
> >
> >
> > Yes, it would require coding of those functions, however afterwards you
> > can access necessary CB device simply by doing core->cb_devs[region].
> >
> > I think current code is overcomplicated for the sake of having the
> > platform flexibility expressed as data.
> >
> > >
> > > > >
> > > > >
> > > > > > >
> > > > > > > >
> > > > > > > > > + const char *name;
> > > > > > > > > + const u32 f_id;
> > > > > > > > > + const enum iris_buffer_region region;
> > > > > > > > > +};
> > > > > > > > > +
> > > > > > > > > enum platform_pm_domain_type {
> > > > > > > > > IRIS_CTRL_POWER_DOMAIN,
> > > > > > > > > IRIS_HW_POWER_DOMAIN,
> > > > > > > > > @@ -246,6 +262,8 @@ struct iris_platform_data {
> > > > > > > > > u32 inst_fw_caps_enc_size;
> > > > > > > > > const struct tz_cp_config *tz_cp_config_data;
> > > > > > > > > u32 tz_cp_config_data_size;
> > > > > > > > > + struct iris_context_bank *cb_data;
> > > > > > > > > + u32 cb_data_size;
> > > > > > > >
> > > > > > > > Do they differ from platform to platform?
> > > > > > > Yes
> > > > > > >
> > > > > > > > Mark them as const, it should be data only.
> > > > > > >
> > > > > > > cb_data_size can be marked as const
> > > > > >
> > > > > > Why is cb_data non-const?
> > > > >
> > > > > dev is being updated once created dynamically.
> > > >
> > > > That's a bad idea. Please make the platform description constant.
> > > >
> > >
> > > I can give it a try to move CBs in core struct out of platform data and have
> > > a buffer region based lookup array to fetch the device.
> >
> > It might be easier to express that as a callback, filling core->cb_devs
> > with struct device pointers, as I wrote above.
>
> IIUC, introduce an ops like below and fill ore->cb_devs[] in SOC specific
> data i.e sm8550_data ?
>
> struct iris_platform_ops {
> int (*populate_cb_devs)(struct iris_core *core);
> };
> struct iris_platform_data {
> const struct iris_platform_ops *ops;
> /* ... other pdata fields ... */
> };
>
> At present lemans shares the platform data of sm8550, with the above ops
> approach, that commonality leverage would be lost ?
>
> Please correct if your proposal is different than what i interpreted.
Yes, it was just about the callback. You've coded it again as a loop of
bitmasks. My opinion would be to just have platform-specific easy
callbacks without extra generalization.
>
> >
> > >
> > > Regards,
> > > Vikash
> >
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 47+ messages in thread
end of thread, other threads:[~2026-03-13 19:26 UTC | newest]
Thread overview: 47+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-27 14:11 [PATCH v2 0/7] media: iris: add support for kaanapali platform Vikash Garodia
2026-02-27 14:11 ` [PATCH v2 1/7] media: dt-bindings: qcom-kaanapali-iris: Add kaanapali video codec binding Vikash Garodia
2026-02-27 15:42 ` Rob Herring (Arm)
2026-02-27 15:50 ` Krzysztof Kozlowski
2026-02-27 15:55 ` Krzysztof Kozlowski
2026-03-03 18:10 ` Vikash Garodia
2026-03-04 15:07 ` Krzysztof Kozlowski
2026-03-05 12:23 ` Vikash Garodia
2026-02-27 19:52 ` Dmitry Baryshkov
2026-03-03 18:13 ` Vikash Garodia
2026-03-03 23:53 ` Dmitry Baryshkov
2026-03-04 15:02 ` Vikash Garodia
2026-03-05 3:33 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 2/7] media: iris: switch to hardware mode after firmware boot Vikash Garodia
2026-02-27 16:49 ` Konrad Dybcio
2026-03-03 18:15 ` Vikash Garodia
2026-03-04 8:57 ` Konrad Dybcio
2026-02-27 14:11 ` [PATCH v2 3/7] media: iris: add iris vpu bus support and register it with iommu_buses Vikash Garodia
2026-02-27 15:49 ` Krzysztof Kozlowski
2026-03-03 18:26 ` Vikash Garodia
2026-02-27 20:14 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 4/7] media: iris: add context bank devices using iommu-map Vikash Garodia
2026-02-27 20:20 ` Dmitry Baryshkov
2026-03-03 18:46 ` Vikash Garodia
2026-03-03 22:25 ` Dmitry Baryshkov
2026-03-05 12:49 ` Vikash Garodia
2026-03-05 14:21 ` Dmitry Baryshkov
2026-03-05 17:26 ` Vikash Garodia
2026-03-05 18:32 ` Dmitry Baryshkov
2026-03-05 21:34 ` Vikash Garodia
2026-03-13 19:26 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 5/7] media: iris: add helper to select context bank device Vikash Garodia
2026-02-27 20:27 ` Dmitry Baryshkov
2026-03-03 19:16 ` Vikash Garodia
2026-03-03 22:27 ` Dmitry Baryshkov
2026-03-04 15:29 ` Vikash Garodia
2026-03-05 3:40 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 6/7] media: iris: add iris4 specific H265 line buffer calculation Vikash Garodia
2026-02-27 20:28 ` Dmitry Baryshkov
2026-03-03 18:48 ` Vikash Garodia
2026-03-03 22:28 ` Dmitry Baryshkov
2026-03-04 15:40 ` Vikash Garodia
2026-03-05 3:41 ` Dmitry Baryshkov
2026-02-27 14:11 ` [PATCH v2 7/7] media: iris: add platform data for kaanapali Vikash Garodia
2026-02-27 15:48 ` Krzysztof Kozlowski
2026-02-28 7:31 ` Dmitry Baryshkov
2026-02-27 15:42 ` [PATCH v2 0/7] media: iris: add support for kaanapali platform Bryan O'Donoghue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox