Skip to contentSkip to conversation

media: qcom: iris: add multi slice support

PATCH Superseded Sachin Kumar Garg 3 participants 7 messages Jul 21 – Jul 23

Subsystems (4)

v3 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v3 cover media: qcom: iris: add multi slice support

This series adds support for multi-slice encoding in the Qualcomm Iris driver.

Multi-slice mode allows encoding a single frame into multiple slices, which can improve error resilience and enable parallel processing. The feature supports two slice modes:
- MAX_MB mode: slices are created based on macroblock count, controlled via V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB
- MAX_BYTES mode: slices are created based on byte size, controlled via V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES

Clients can enable slice mode using the V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE control.

Patch 1 is a prerequisite fix: iris_set_stage() currently always selects STAGE_2 work mode for encoder sessions, but CBR rate control requires STAGE_1. This is fixed by forcing STAGE_1 when BITRATE_MODE is set to CBR.

Patch 2 adds the multi-slice support itself for Iris HFI Gen2 based targets (qcs8300, sm8550 and other SM8550-derived targets). Support for HFI Gen1 targets will be added in a follow-up series.

This series has been verified with GST level testing. Command used:
gst-launch-1.0 -v videotestsrc ! video/x-raw,format=NV12, \
width=1280,height=720,framerate=30/1 ! v4l2h264enc output-io-mode=4 | capture-io-mode=4 extra-controls="controls,video_bitrate_mode=1, \
slice_partitioning_method=1,number_of_mbs_in_a_slice=460;" \
! filesink location=/opt/test_enc.h264

Changes in v3:
- Patch 1 (force stage 1 work mode for CBR RC): cache the computed work_mode into inst->fw_caps[STAGE].value so buffer-size and clock-frequency calculations stay consistent with what is actually configured on firmware.
- Patch 2 (multi-slice support):
- Use inst->hfi_rc_type instead of the raw V4L2 BITRATE_MODE value when validating/deriving slice parameters, avoiding a mismatch between V4L2 and firmware rate-control enums.
- Round up (instead of truncate) when computing the minimum MAX_MB and MAX_BYTES slice size floors, so the hardware's max-slices-per-frame limit is never exceeded.

Changes in v2:
- Added a prerequisite patch to force STAGE_1 work mode for CBR rate control on the encoder, required for multi-slice encoding to work correctly.
- Addressed review comments on the multi-slice patch (updated commit subject and description).

---
Sachin Kumar Garg (2):
media: iris: force stage 1 work mode for CBR RC on encoder
media: iris: add support for multi_slice in iris encoder

 drivers/media/platform/qcom/iris/iris_ctrls.c      | 87 ++++++++++++++++++++++
 drivers/media/platform/qcom/iris/iris_ctrls.h      |  1 +
 drivers/media/platform/qcom/iris/iris_hfi_gen2.c   | 33 +++++++-
 .../platform/qcom/iris/iris_hfi_gen2_defines.h     |  2 +
 .../platform/qcom/iris/iris_platform_common.h      | 12 +++
 .../platform/qcom/iris/iris_platform_qcs8300.h     |  9 +++
 .../platform/qcom/iris/iris_platform_sm8550.h      |  9 +++
 .../media/platform/qcom/iris/iris_platform_vpu2.c  |  9 +++
 8 files changed, 161 insertions(+), 1 deletion(-)

---
base-commit: 42f83a32259a82c4481d3cccf560c3bfeb32c892
change-id: 20260716-iris_multi_slice-5647287a9563

Best regards,

Signature · 1 line
Sachin Kumar Garg <[email protected]>
#1 lore raw

PATCH v3 1/2 media: iris: force stage 1 work mode for CBR RC on encoder

iris_set_stage() currently always picks STAGE_2 for encoder sessions. CBR rate control requires stage 1 operation, so force STAGE_1 when BITRATE_MODE is set to CBR.

The BITRATE_MODE fw_cap value is used instead of inst->hfi_rc_type since STAGE precedes BITRATE_MODE in enum platform_inst_fw_cap_type, so iris_set_properties() would still see the previous hfi_rc_type when iris_set_stage() runs during initial config

---
 drivers/media/platform/qcom/iris/iris_ctrls.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/media/platform/qcom/iris/iris_ctrls.c +5 -0
index 10e33b8a73f6..d7cbf6c3614a 100644
@@ -519,8 +519,13 @@ int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
 	if (inst->domain == DECODER) {
 		if (iris_res_is_less_than(width, height, 1280, 720))
 			work_mode = STAGE_1;
+	} else if (inst->domain == ENCODER) {
+		if (inst->fw_caps[BITRATE_MODE].value == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)
+			work_mode = STAGE_1;
 	}
 
+	inst->fw_caps[cap_id].value = work_mode;
+
 	return hfi_ops->session_set_property(inst, hfi_id,
 					     HFI_HOST_FLAGS_NONE,
 					     iris_get_port_info(inst, cap_id),
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH v3 1/2] media: iris: force stage 1 work mode for CBR RC on encoder

Quoted 20 lines · Sachin Kumar Garg

iris_set_stage() currently always picks STAGE_2 for encoder sessions. CBR rate control requires stage 1 operation, so force STAGE_1 when BITRATE_MODE is set to CBR.

The BITRATE_MODE fw_cap value is used instead of inst->hfi_rc_type since STAGE precedes BITRATE_MODE in enum platform_inst_fw_cap_type, so iris_set_properties() would still see the previous hfi_rc_type when iris_set_stage() runs during initial config

---
 drivers/media/platform/qcom/iris/iris_ctrls.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/media/platform/qcom/iris/iris_ctrls.c +0 -0
index 10e33b8a73f6..d7cbf6c3614a 100644

drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id · line 527

Quoted 9 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +4 -0
@@ -519,8 +519,13 @@ int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
 	if (inst->domain == DECODER) {
 		if (iris_res_is_less_than(width, height, 1280, 720))
 			work_mode = STAGE_1;
+	} else if (inst->domain == ENCODER) {
+		if (inst->fw_caps[BITRATE_MODE].value == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)
+			work_mode = STAGE_1;
 	}
 
+	inst->fw_caps[cap_id].value = work_mode;

Separate commit, Fixes tag.

Quoted 8 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +1 -0
+
 	return hfi_ops->session_set_property(inst, hfi_id,
 					     HFI_HOST_FLAGS_NONE,
 					     iris_get_port_info(inst, cap_id),
Signature · 2 lines
-- 
2.34.1
Signature · 2 lines
With best wishes
Dmitry
#3 lore raw

Re: [PATCH v3 1/2] media: iris: force stage 1 work mode for CBR RC on encoder

Quoted 29 lines · Dmitry Baryshkov
Quoted 28 lines · Sachin Kumar Garg

iris_set_stage() currently always picks STAGE_2 for encoder sessions. CBR rate control requires stage 1 operation, so force STAGE_1 when BITRATE_MODE is set to CBR.

The BITRATE_MODE fw_cap value is used instead of inst->hfi_rc_type since STAGE precedes BITRATE_MODE in enum platform_inst_fw_cap_type, so iris_set_properties() would still see the previous hfi_rc_type when iris_set_stage() runs during initial config

---
  drivers/media/platform/qcom/iris/iris_ctrls.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/media/platform/qcom/iris/iris_ctrls.c +3 -0
index 10e33b8a73f6..d7cbf6c3614a 100644
@@ -519,8 +519,13 @@ int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
  	if (inst->domain == DECODER) {
  		if (iris_res_is_less_than(width, height, 1280, 720))
  			work_mode = STAGE_1;
+	} else if (inst->domain == ENCODER) {
+		if (inst->fw_caps[BITRATE_MODE].value == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)
+			work_mode = STAGE_1;
  	}
 
Quoted 4 lines

drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id · line 527

Quoted 1 line
drivers/media/platform/qcom/iris/iris_ctrls.c +1 -0
+	inst->fw_caps[cap_id].value = work_mode;

Separate commit, Fixes tag.

Thanks, Dmitry. Agreed — this is fixed in v4: split into a separate patch ("cache work mode after computing it in iris_set_stage") with a fixes tag.

Quoted 9 lines
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +1 -0
+
  	return hfi_ops->session_set_property(inst, hfi_id,
  					     HFI_HOST_FLAGS_NONE,
  					     iris_get_port_info(inst, cap_id),
Signature · 2 lines
-- 
2.34.1
#4 lore raw

PATCH v3 2/2 media: iris: add support for multi_slice in iris encoder

In reply to Sachin Kumar Garg

Add multi-slice encoding support with MAX_MB and MAX_BYTES modes.

Clients can enable slice mode using V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE control and configure slice size via V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB or V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES controls.

---
 drivers/media/platform/qcom/iris/iris_ctrls.c      | 82 ++++++++++++++++++++++
 drivers/media/platform/qcom/iris/iris_ctrls.h      |  1 +
 drivers/media/platform/qcom/iris/iris_hfi_gen2.c   | 33 ++++++++-
 .../platform/qcom/iris/iris_hfi_gen2_defines.h     |  2 +
 .../platform/qcom/iris/iris_platform_common.h      | 12 ++++
 .../platform/qcom/iris/iris_platform_qcs8300.h     |  9 +++
 .../platform/qcom/iris/iris_platform_sm8550.h      |  9 +++
 .../media/platform/qcom/iris/iris_platform_vpu2.c  |  9 +++
 8 files changed, 156 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +82 -0
index d7cbf6c3614a..36ccb9918921 100644
@@ -154,6 +154,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
 		return LAYER4_BITRATE_HEVC;
 	case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR:
 		return LAYER5_BITRATE_HEVC;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE:
+		return SLICE_MODE;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:
+		return SLICE_MAX_BYTES;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:
+		return SLICE_MAX_MB;
 	default:
 		return INST_FW_CAP_MAX;
 	}
@@ -297,6 +303,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
 		return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR;
 	case LAYER5_BITRATE_HEVC:
 		return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR;
+	case SLICE_MODE:
+		return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE;
+	case SLICE_MAX_BYTES:
+		return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES;
+	case SLICE_MAX_MB:
+		return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB;
 	default:
 		return 0;
 	}
@@ -1482,6 +1494,76 @@ int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_typ
 					     &bitrate, sizeof(u32));
 }
 
+int iris_set_slice_count(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
+{
+	const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops;
+	struct platform_inst_caps *caps = inst->core->iris_platform_data->inst_caps;
+	u32 slice_mode = inst->fw_caps[SLICE_MODE].value;
+	u32 bitrate = inst->fw_caps[BITRATE].value;
+	u32 rc_type = inst->hfi_rc_type;
+	u32 fps = inst->frame_rate;
+	u32 output_width = inst->fmt_dst->fmt.pix_mp.width;
+	u32 output_height = inst->fmt_dst->fmt.pix_mp.height;
+	u32 mbpf = NUM_MBS_PER_FRAME(output_height, output_width);
+	u32 max_width, max_height, min_width, min_height;
+	u32 max_avg_slicesize, hfi_value, hfi_id;
+
+	if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) {
+		dev_dbg(inst->core->dev, "slice mode is: %u, ignore setting to fw\n", slice_mode);
+		return 0;
+	}
+	if (!fps) {
+		dev_err(inst->core->dev, "Invalid frame rate %d\n", fps);
+		return -EINVAL;
+	}
+	if (fps > caps->max_slice_frame_rate ||
+	    (rc_type != HFI_RC_OFF && rc_type != HFI_RC_CBR_CFR &&
+	    rc_type != HFI_RC_CBR_VFR && rc_type != HFI_RC_VBR_CFR)) {
+		dev_err(inst->core->dev, "slice unsupported, fps: %u, rc_type: %#x\n",
+			fps, rc_type);
+		return -EINVAL;
+	}
+
+	max_width = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ?
+			caps->max_mb_slice_width : caps->max_bytes_slice_width;
+	max_height = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ?
+			caps->max_mb_slice_height : caps->max_bytes_slice_height;
+	min_width = (inst->codec == V4L2_PIX_FMT_HEVC) ?
+			caps->min_hevc_slice_width : caps->min_avc_slice_width;
+	min_height = caps->min_slice_height;
+
+	if (output_width < min_width || output_height < min_height ||
+	    output_width > max_width || output_height > max_height) {
+		dev_err(inst->core->dev, "slice unsupported, codec: %#x wxh: [%dx%d]\n",
+			inst->codec, output_width, output_height);
+		return -EINVAL;
+	}
+
+	if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
+		hfi_value = inst->fw_caps[SLICE_MAX_MB].value;
+		hfi_value = max(hfi_value, DIV_ROUND_UP(mbpf, caps->max_slices_per_frame));
+		if (inst->codec == V4L2_PIX_FMT_HEVC)
+			hfi_value = (hfi_value + 3) / 4;
+		hfi_id = inst->fw_caps[SLICE_MAX_MB].hfi_id;
+	} else if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
+		hfi_value = inst->fw_caps[SLICE_MAX_BYTES].value;
+		if (rc_type != HFI_RC_OFF) {
+			max_avg_slicesize = DIV_ROUND_UP((bitrate / fps) / 8,
+							 caps->max_slices_per_frame);
+			hfi_value = max(hfi_value, max_avg_slicesize);
+		}
+		hfi_id = inst->fw_caps[SLICE_MAX_BYTES].hfi_id;
+	} else {
+		return -EINVAL;
+	}
+
+	return hfi_ops->session_set_property(inst, hfi_id,
+					     HFI_HOST_FLAGS_NONE,
+					     iris_get_port_info(inst, cap_id),
+					     HFI_PAYLOAD_U32,
+					     &hfi_value, sizeof(u32));
+}
+
 int iris_set_properties(struct iris_inst *inst, u32 plane)
 {
 	const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops;
drivers/media/platform/qcom/iris/iris_ctrls.h +1 -0
index 3c462ec9190b..5a73c7c49d36 100644
@@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum platform_inst_fw_cap_type c
 int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
 int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
 int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
+int iris_set_slice_count(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
 int iris_set_properties(struct iris_inst *inst, u32 plane);
 
 #endif
drivers/media/platform/qcom/iris/iris_hfi_gen2.c +32 -1
index acc0ed8adda1..fcbebced05c3 100644
@@ -12,6 +12,8 @@
 
 #define VIDEO_ARCH_LX 1
 #define BITRATE_MAX				245000000
+#define MAX_SLICE_MB_SIZE         \
+	(((4096 + 15) >> 4) * ((2160 + 15) >> 4))
 
 static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
 	{
@@ -937,7 +939,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = {
 		.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
 			CAP_FLAG_DYNAMIC_ALLOWED,
 		.set = iris_set_layer_bitrate,
-	}
+	},
+	{
+		.cap_id = SLICE_MODE,
+		.min = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
+		.max = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES,
+		.step_or_mask = BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) |
+					BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) |
+					BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES),
+		.value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
+		.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
+		.set = iris_set_slice_count,
+	},
+	{
+		.cap_id = SLICE_MAX_BYTES,
+		.min = 512,
+		.max = BITRATE_MAX >> 3,
+		.step_or_mask = 1,
+		.value = 512,
+		.hfi_id = HFI_PROP_MULTI_SLICE_BYTES_COUNT,
+		.flags = CAP_FLAG_OUTPUT_PORT,
+	},
+	{
+		.cap_id = SLICE_MAX_MB,
+		.min = 1,
+		.max = MAX_SLICE_MB_SIZE,
+		.step_or_mask = 1,
+		.value = 1,
+		.hfi_id = HFI_PROP_MULTI_SLICE_MB_COUNT,
+		.flags = CAP_FLAG_OUTPUT_PORT,
+	},
 };
 
 static const u32 sm8550_vdec_input_config_params_default[] = {
drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +2 -0
index 776b21cd11b2..226894b99dcc 100644
@@ -71,6 +71,8 @@ enum hfi_rate_control {
 #define HFI_PROP_MIN_QP_PACKED			0x0300012f
 #define HFI_PROP_MAX_QP_PACKED			0x03000130
 #define HFI_PROP_IR_RANDOM_PERIOD		0x03000131
+#define HFI_PROP_MULTI_SLICE_MB_COUNT		0x03000132
+#define HFI_PROP_MULTI_SLICE_BYTES_COUNT	0x03000133
 #define HFI_PROP_LTR_COUNT			0x03000134
 #define HFI_PROP_LTR_MARK			0x03000135
 #define HFI_PROP_LTR_USE			0x03000136
drivers/media/platform/qcom/iris/iris_platform_common.h +12 -0
index c9256f2323dc..659d15166365 100644
@@ -100,6 +100,15 @@ struct platform_inst_caps {
 	u32 mb_cycles_fw_vpp;
 	u32 max_frame_rate;
 	u32 max_operating_rate;
+	u32 max_slices_per_frame;
+	u32 max_slice_frame_rate;
+	u32 max_mb_slice_width;
+	u32 max_mb_slice_height;
+	u32 max_bytes_slice_width;
+	u32 max_bytes_slice_height;
+	u32 min_hevc_slice_width;
+	u32 min_avc_slice_width;
+	u32 min_slice_height;
 };
 
 enum platform_inst_fw_cap_type {
@@ -183,6 +192,9 @@ enum platform_inst_fw_cap_type {
 	LAYER3_BITRATE_HEVC,
 	LAYER4_BITRATE_HEVC,
 	LAYER5_BITRATE_HEVC,
+	SLICE_MODE,
+	SLICE_MAX_BYTES,
+	SLICE_MAX_MB,
 	INST_FW_CAP_MAX,
 };
 
drivers/media/platform/qcom/iris/iris_platform_qcs8300.h +9 -0
index 3cfecae80d1e..764acf71c72b 100644
@@ -17,6 +17,15 @@ static struct platform_inst_caps platform_inst_cap_qcs8300 = {
 	.mb_cycles_fw_vpp = 44156,
 	.max_frame_rate = MAXIMUM_FPS,
 	.max_operating_rate = MAXIMUM_FPS,
+	.max_slices_per_frame = 128,
+	.max_slice_frame_rate = 60,
+	.max_mb_slice_width = 4096,
+	.max_mb_slice_height = 2160,
+	.max_bytes_slice_width = 1920,
+	.max_bytes_slice_height = 1088,
+	.min_hevc_slice_width = 384,
+	.min_avc_slice_width = 192,
+	.min_slice_height = 128,
 };
 
 #endif
drivers/media/platform/qcom/iris/iris_platform_sm8550.h +9 -0
index 3c9dae995bb2..ef87976c2360 100644
@@ -25,6 +25,15 @@ static struct platform_inst_caps platform_inst_cap_sm8550 = {
 	.mb_cycles_fw_vpp = 66234,
 	.max_frame_rate = MAXIMUM_FPS,
 	.max_operating_rate = MAXIMUM_FPS,
+	.max_slices_per_frame = 128,
+	.max_slice_frame_rate = 60,
+	.max_mb_slice_width = 4096,
+	.max_mb_slice_height = 2160,
+	.max_bytes_slice_width = 1920,
+	.max_bytes_slice_height = 1088,
+	.min_hevc_slice_width = 384,
+	.min_avc_slice_width = 192,
+	.min_slice_height = 128,
 };
 
 #endif
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +9 -0
index 6e06a32822bb..39720e7af889 100644
@@ -44,6 +44,15 @@ static struct platform_inst_caps platform_inst_cap_vpu2 = {
 	.mb_cycles_vpp = 200,
 	.max_frame_rate = MAXIMUM_FPS,
 	.max_operating_rate = MAXIMUM_FPS,
+	.max_slices_per_frame = 128,
+	.max_slice_frame_rate = 60,
+	.max_mb_slice_width = 4096,
+	.max_mb_slice_height = 2160,
+	.max_bytes_slice_width = 1920,
+	.max_bytes_slice_height = 1088,
+	.min_hevc_slice_width = 384,
+	.min_avc_slice_width = 192,
+	.min_slice_height = 128,
 };
 
 static const struct icc_info iris_icc_info_vpu2[] = {
Signature · 1 line
2.34.1
maintainer
#5 lore raw

Re: [PATCH v3 2/2] media: iris: add support for multi_slice in iris encoder

Quoted 278 lines · Sachin Kumar Garg

Add multi-slice encoding support with MAX_MB and MAX_BYTES modes.

Clients can enable slice mode using V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE control and configure slice size via V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB or V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES controls.

---
  drivers/media/platform/qcom/iris/iris_ctrls.c      | 82 ++++++++++++++++++++++
  drivers/media/platform/qcom/iris/iris_ctrls.h      |  1 +
  drivers/media/platform/qcom/iris/iris_hfi_gen2.c   | 33 ++++++++-
  .../platform/qcom/iris/iris_hfi_gen2_defines.h     |  2 +
  .../platform/qcom/iris/iris_platform_common.h      | 12 ++++
  .../platform/qcom/iris/iris_platform_qcs8300.h     |  9 +++
  .../platform/qcom/iris/iris_platform_sm8550.h      |  9 +++
  .../media/platform/qcom/iris/iris_platform_vpu2.c  |  9 +++
  8 files changed, 156 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +82 -0
index d7cbf6c3614a..36ccb9918921 100644
@@ -154,6 +154,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
  		return LAYER4_BITRATE_HEVC;
  	case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR:
  		return LAYER5_BITRATE_HEVC;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE:
+		return SLICE_MODE;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:
+		return SLICE_MAX_BYTES;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:
+		return SLICE_MAX_MB;
  	default:
  		return INST_FW_CAP_MAX;
  	}
@@ -297,6 +303,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
  		return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR;
  	case LAYER5_BITRATE_HEVC:
  		return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR;
+	case SLICE_MODE:
+		return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE;
+	case SLICE_MAX_BYTES:
+		return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES;
+	case SLICE_MAX_MB:
+		return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB;
  	default:
  		return 0;
  	}
@@ -1482,6 +1494,76 @@ int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_typ
  					     &bitrate, sizeof(u32));
  }
 
+int iris_set_slice_count(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
+{
+	const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops;
+	struct platform_inst_caps *caps = inst->core->iris_platform_data->inst_caps;
+	u32 slice_mode = inst->fw_caps[SLICE_MODE].value;
+	u32 bitrate = inst->fw_caps[BITRATE].value;
+	u32 rc_type = inst->hfi_rc_type;
+	u32 fps = inst->frame_rate;
+	u32 output_width = inst->fmt_dst->fmt.pix_mp.width;
+	u32 output_height = inst->fmt_dst->fmt.pix_mp.height;
+	u32 mbpf = NUM_MBS_PER_FRAME(output_height, output_width);
+	u32 max_width, max_height, min_width, min_height;
+	u32 max_avg_slicesize, hfi_value, hfi_id;
+
+	if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) {
+		dev_dbg(inst->core->dev, "slice mode is: %u, ignore setting to fw\n", slice_mode);
+		return 0;
+	}
+	if (!fps) {
+		dev_err(inst->core->dev, "Invalid frame rate %d\n", fps);
+		return -EINVAL;
+	}
+	if (fps > caps->max_slice_frame_rate ||
+	    (rc_type != HFI_RC_OFF && rc_type != HFI_RC_CBR_CFR &&
+	    rc_type != HFI_RC_CBR_VFR && rc_type != HFI_RC_VBR_CFR)) {
+		dev_err(inst->core->dev, "slice unsupported, fps: %u, rc_type: %#x\n",
+			fps, rc_type);
+		return -EINVAL;
+	}
+
+	max_width = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ?
+			caps->max_mb_slice_width : caps->max_bytes_slice_width;
+	max_height = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ?
+			caps->max_mb_slice_height : caps->max_bytes_slice_height;
+	min_width = (inst->codec == V4L2_PIX_FMT_HEVC) ?
+			caps->min_hevc_slice_width : caps->min_avc_slice_width;
+	min_height = caps->min_slice_height;
+
+	if (output_width < min_width || output_height < min_height ||
+	    output_width > max_width || output_height > max_height) {
+		dev_err(inst->core->dev, "slice unsupported, codec: %#x wxh: [%dx%d]\n",
+			inst->codec, output_width, output_height);
+		return -EINVAL;
+	}
+
+	if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
+		hfi_value = inst->fw_caps[SLICE_MAX_MB].value;
+		hfi_value = max(hfi_value, DIV_ROUND_UP(mbpf, caps->max_slices_per_frame));
+		if (inst->codec == V4L2_PIX_FMT_HEVC)
+			hfi_value = (hfi_value + 3) / 4;
+		hfi_id = inst->fw_caps[SLICE_MAX_MB].hfi_id;
+	} else if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
+		hfi_value = inst->fw_caps[SLICE_MAX_BYTES].value;
+		if (rc_type != HFI_RC_OFF) {
+			max_avg_slicesize = DIV_ROUND_UP((bitrate / fps) / 8,
+							 caps->max_slices_per_frame);
+			hfi_value = max(hfi_value, max_avg_slicesize);
+		}
+		hfi_id = inst->fw_caps[SLICE_MAX_BYTES].hfi_id;
+	} else {
+		return -EINVAL;
+	}
+
+	return hfi_ops->session_set_property(inst, hfi_id,
+					     HFI_HOST_FLAGS_NONE,
+					     iris_get_port_info(inst, cap_id),
+					     HFI_PAYLOAD_U32,
+					     &hfi_value, sizeof(u32));
+}
+
  int iris_set_properties(struct iris_inst *inst, u32 plane)
  {
  	const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops;
drivers/media/platform/qcom/iris/iris_ctrls.h +1 -0
index 3c462ec9190b..5a73c7c49d36 100644
@@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum platform_inst_fw_cap_type c
  int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
  int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
  int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
+int iris_set_slice_count(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
  int iris_set_properties(struct iris_inst *inst, u32 plane);
 
  #endif
drivers/media/platform/qcom/iris/iris_hfi_gen2.c +32 -1
index acc0ed8adda1..fcbebced05c3 100644
@@ -12,6 +12,8 @@
 
  #define VIDEO_ARCH_LX 1
  #define BITRATE_MAX				245000000
+#define MAX_SLICE_MB_SIZE         \
+	(((4096 + 15) >> 4) * ((2160 + 15) >> 4))
 
  static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
  	{
@@ -937,7 +939,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = {
  		.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
  			CAP_FLAG_DYNAMIC_ALLOWED,
  		.set = iris_set_layer_bitrate,
-	}
+	},
+	{
+		.cap_id = SLICE_MODE,
+		.min = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
+		.max = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES,
+		.step_or_mask = BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) |
+					BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) |
+					BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES),
+		.value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
+		.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
+		.set = iris_set_slice_count,
+	},
+	{
+		.cap_id = SLICE_MAX_BYTES,
+		.min = 512,
+		.max = BITRATE_MAX >> 3,
+		.step_or_mask = 1,
+		.value = 512,
+		.hfi_id = HFI_PROP_MULTI_SLICE_BYTES_COUNT,
+		.flags = CAP_FLAG_OUTPUT_PORT,
+	},
+	{
+		.cap_id = SLICE_MAX_MB,
+		.min = 1,
+		.max = MAX_SLICE_MB_SIZE,
+		.step_or_mask = 1,
+		.value = 1,
+		.hfi_id = HFI_PROP_MULTI_SLICE_MB_COUNT,
+		.flags = CAP_FLAG_OUTPUT_PORT,
+	},
  };
 
  static const u32 sm8550_vdec_input_config_params_default[] = {
drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +2 -0
index 776b21cd11b2..226894b99dcc 100644
@@ -71,6 +71,8 @@ enum hfi_rate_control {
  #define HFI_PROP_MIN_QP_PACKED			0x0300012f
  #define HFI_PROP_MAX_QP_PACKED			0x03000130
  #define HFI_PROP_IR_RANDOM_PERIOD		0x03000131
+#define HFI_PROP_MULTI_SLICE_MB_COUNT		0x03000132
+#define HFI_PROP_MULTI_SLICE_BYTES_COUNT	0x03000133
  #define HFI_PROP_LTR_COUNT			0x03000134
  #define HFI_PROP_LTR_MARK			0x03000135
  #define HFI_PROP_LTR_USE			0x03000136
drivers/media/platform/qcom/iris/iris_platform_common.h +12 -0
index c9256f2323dc..659d15166365 100644
@@ -100,6 +100,15 @@ struct platform_inst_caps {
  	u32 mb_cycles_fw_vpp;
  	u32 max_frame_rate;
  	u32 max_operating_rate;
+	u32 max_slices_per_frame;
+	u32 max_slice_frame_rate;
+	u32 max_mb_slice_width;
+	u32 max_mb_slice_height;
+	u32 max_bytes_slice_width;
+	u32 max_bytes_slice_height;
+	u32 min_hevc_slice_width;
+	u32 min_avc_slice_width;
+	u32 min_slice_height;
  };
 
  enum platform_inst_fw_cap_type {
@@ -183,6 +192,9 @@ enum platform_inst_fw_cap_type {
  	LAYER3_BITRATE_HEVC,
  	LAYER4_BITRATE_HEVC,
  	LAYER5_BITRATE_HEVC,
+	SLICE_MODE,
+	SLICE_MAX_BYTES,
+	SLICE_MAX_MB,
  	INST_FW_CAP_MAX,
  };
 
drivers/media/platform/qcom/iris/iris_platform_qcs8300.h +9 -0
index 3cfecae80d1e..764acf71c72b 100644
@@ -17,6 +17,15 @@ static struct platform_inst_caps platform_inst_cap_qcs8300 = {
  	.mb_cycles_fw_vpp = 44156,
  	.max_frame_rate = MAXIMUM_FPS,
  	.max_operating_rate = MAXIMUM_FPS,
+	.max_slices_per_frame = 128,
+	.max_slice_frame_rate = 60,
+	.max_mb_slice_width = 4096,
+	.max_mb_slice_height = 2160,
+	.max_bytes_slice_width = 1920,
+	.max_bytes_slice_height = 1088,
+	.min_hevc_slice_width = 384,
+	.min_avc_slice_width = 192,
+	.min_slice_height = 128,
  };
 
  #endif
drivers/media/platform/qcom/iris/iris_platform_sm8550.h +9 -0
index 3c9dae995bb2..ef87976c2360 100644
@@ -25,6 +25,15 @@ static struct platform_inst_caps platform_inst_cap_sm8550 = {
  	.mb_cycles_fw_vpp = 66234,
  	.max_frame_rate = MAXIMUM_FPS,
  	.max_operating_rate = MAXIMUM_FPS,
+	.max_slices_per_frame = 128,
+	.max_slice_frame_rate = 60,
+	.max_mb_slice_width = 4096,
+	.max_mb_slice_height = 2160,
+	.max_bytes_slice_width = 1920,
+	.max_bytes_slice_height = 1088,
+	.min_hevc_slice_width = 384,
+	.min_avc_slice_width = 192,
+	.min_slice_height = 128,
  };
 
  #endif
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +0 -0
index 6e06a32822bb..39720e7af889 100644
@@ -44,6 +44,15 @@ static struct platform_inst_caps platform_inst_cap_vpu2 = {
  	.mb_cycles_vpp = 200,
  	.max_frame_rate = MAXIMUM_FPS,

drivers/media/platform/qcom/iris/iris_platform_vpu2.c static struct platform_inst_caps platform_inst_cap_vpu2 = { · line 55

Quoted 10 lines
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +9 -0
  	.max_operating_rate = MAXIMUM_FPS,
+	.max_slices_per_frame = 128,
+	.max_slice_frame_rate = 60,
+	.max_mb_slice_width = 4096,
+	.max_mb_slice_height = 2160,
+	.max_bytes_slice_width = 1920,
+	.max_bytes_slice_height = 1088,
+	.min_hevc_slice_width = 384,
+	.min_avc_slice_width = 192,
+	.min_slice_height = 128,

I do not see these values are changing for different SOC data here. Would prefer to do the macro instead of inflating the platform struct.

Regards,
Vikash

Quoted 4 lines
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +0 -0
  };
 
  static const struct icc_info iris_icc_info_vpu2[] = {
#6 lore raw

Re: [PATCH v3 2/2] media: iris: add support for multi_slice in iris encoder

Quoted 303 lines · Vikash Garodia
Quoted 288 lines · Sachin Kumar Garg

Add multi-slice encoding support with MAX_MB and MAX_BYTES modes.

Clients can enable slice mode using V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE control and configure slice size via V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB or V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES controls.

---
  drivers/media/platform/qcom/iris/iris_ctrls.c      | 82 ++++++++++++
++++++++++
  drivers/media/platform/qcom/iris/iris_ctrls.h      |  1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c   | 33 ++++++++- .../platform/qcom/iris/iris_hfi_gen2_defines.h     |  2 + .../platform/qcom/iris/iris_platform_common.h      | 12 ++++ .../platform/qcom/iris/iris_platform_qcs8300.h     |  9 +++ .../platform/qcom/iris/iris_platform_sm8550.h      |  9 +++ .../media/platform/qcom/iris/iris_platform_vpu2.c  |  9 +++

  8 files changed, 156 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +0 -0
index d7cbf6c3614a..36ccb9918921 100644
@@ -154,6 +154,12 @@ static enum platform_inst_fw_cap_type 
 iris_get_cap_id(u32 id)
           return LAYER4_BITRATE_HEVC;

      case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR:
          return LAYER5_BITRATE_HEVC;
+    case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE:
+        return SLICE_MODE;
+    case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:
+        return SLICE_MAX_BYTES;
+    case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:
+        return SLICE_MAX_MB;
      default:
          return INST_FW_CAP_MAX;
      }

drivers/media/platform/qcom/iris/iris_ctrls.c +0 -0
@@ -297,6 +303,12 @@ static u32 iris_get_v4l2_id(enum 
 platform_inst_fw_cap_type cap_id)
           return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR;

      case LAYER5_BITRATE_HEVC:
          return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR; +    case SLICE_MODE:
+        return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE; +    case SLICE_MAX_BYTES:
+        return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES; +    case SLICE_MAX_MB:
+        return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB; default:
          return 0;
      }

drivers/media/platform/qcom/iris/iris_ctrls.c +26 -0
@@ -1482,6 +1494,76 @@ int iris_set_layer_bitrate(struct iris_inst 
 *inst, enum platform_inst_fw_cap_typ
                            &bitrate, sizeof(u32));
   }
+int iris_set_slice_count(struct iris_inst *inst, enum 
 platform_inst_fw_cap_type cap_id)
+{
+    const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops;
+    struct platform_inst_caps *caps = inst->core->iris_platform_data- 
 >inst_caps;
+    u32 slice_mode = inst->fw_caps[SLICE_MODE].value;
+    u32 bitrate = inst->fw_caps[BITRATE].value;
+    u32 rc_type = inst->hfi_rc_type;
+    u32 fps = inst->frame_rate;
+    u32 output_width = inst->fmt_dst->fmt.pix_mp.width;
+    u32 output_height = inst->fmt_dst->fmt.pix_mp.height;
+    u32 mbpf = NUM_MBS_PER_FRAME(output_height, output_width);
+    u32 max_width, max_height, min_width, min_height;
+    u32 max_avg_slicesize, hfi_value, hfi_id;
+
+    if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) {
+        dev_dbg(inst->core->dev, "slice mode is: %u, ignore setting 
 to fw\n", slice_mode);
+        return 0;
+    }
+    if (!fps) {
+        dev_err(inst->core->dev, "Invalid frame rate %d\n", fps);
+        return -EINVAL;
+    }
+    if (fps > caps->max_slice_frame_rate ||
+        (rc_type != HFI_RC_OFF && rc_type != HFI_RC_CBR_CFR &&
+        rc_type != HFI_RC_CBR_VFR && rc_type != HFI_RC_VBR_CFR)) {
+        dev_err(inst->core->dev, "slice unsupported, fps: %u, 

rc_type: %#x\n",
+            fps, rc_type);
+        return -EINVAL;
+    }
+
+    max_width = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ?
+            caps->max_mb_slice_width : caps->max_bytes_slice_width; +    max_height = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ?
+            caps->max_mb_slice_height : caps->max_bytes_slice_height; +    min_width = (inst->codec == V4L2_PIX_FMT_HEVC) ?
+            caps->min_hevc_slice_width : caps->min_avc_slice_width; +    min_height = caps->min_slice_height;
+
+    if (output_width < min_width || output_height < min_height || +        output_width > max_width || output_height > max_height) { +        dev_err(inst->core->dev, "slice unsupported, codec: %#x wxh:
[%dx%d]\n",
+            inst->codec, output_width, output_height);
+        return -EINVAL;
+    }
+
+    if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) { +        hfi_value = inst->fw_caps[SLICE_MAX_MB].value;
+        hfi_value = max(hfi_value, DIV_ROUND_UP(mbpf, caps-

Quoted 1 line

max_slices_per_frame));

+        if (inst->codec == V4L2_PIX_FMT_HEVC)
+            hfi_value = (hfi_value + 3) / 4;
+        hfi_id = inst->fw_caps[SLICE_MAX_MB].hfi_id;
+    } else if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
+        hfi_value = inst->fw_caps[SLICE_MAX_BYTES].value; +        if (rc_type != HFI_RC_OFF) {
+            max_avg_slicesize = DIV_ROUND_UP((bitrate / fps) / 8, +                             caps->max_slices_per_frame); +            hfi_value = max(hfi_value, max_avg_slicesize); +        }
+        hfi_id = inst->fw_caps[SLICE_MAX_BYTES].hfi_id; +    } else {
+        return -EINVAL;
+    }

drivers/media/platform/qcom/iris/iris_ctrls.c +8 -0
+
+    return hfi_ops->session_set_property(inst, hfi_id,
+                         HFI_HOST_FLAGS_NONE,
+                         iris_get_port_info(inst, cap_id),
+                         HFI_PAYLOAD_U32,
+                         &hfi_value, sizeof(u32));
+}
+

  int iris_set_properties(struct iris_inst *inst, u32 plane) {
      const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops;

drivers/media/platform/qcom/iris/iris_ctrls.h +0 -0
index 3c462ec9190b..5a73c7c49d36 100644
@@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum 

platform_inst_fw_cap_type c
  int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); +int iris_set_slice_count(struct iris_inst *inst, enum
platform_inst_fw_cap_type cap_id);
  int iris_set_properties(struct iris_inst *inst, u32 plane);
  #endif

drivers/media/platform/qcom/iris/iris_hfi_gen2.c +2 -0
index acc0ed8adda1..fcbebced05c3 100644
@@ -12,6 +12,8 @@
   #define VIDEO_ARCH_LX 1
   #define BITRATE_MAX                245000000
+#define MAX_SLICE_MB_SIZE         \
+    (((4096 + 15) >> 4) * ((2160 + 15) >> 4))
   static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
       {
@@ -937,7 +939,36 @@ static const struct platform_inst_fw_cap 
 inst_fw_cap_sm8550_enc[] = {

          .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED,
          .set = iris_set_layer_bitrate,
-    }
+    },
+    {
+        .cap_id = SLICE_MODE,
+        .min = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
+        .max = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES, +        .step_or_mask = BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) | +                    BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) | +                    BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES), +        .value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
+        .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
+        .set = iris_set_slice_count,
+    },
+    {
+        .cap_id = SLICE_MAX_BYTES,
+        .min = 512,
+        .max = BITRATE_MAX >> 3,
+        .step_or_mask = 1,
+        .value = 512,
+        .hfi_id = HFI_PROP_MULTI_SLICE_BYTES_COUNT,
+        .flags = CAP_FLAG_OUTPUT_PORT,
+    },
+    {
+        .cap_id = SLICE_MAX_MB,
+        .min = 1,
+        .max = MAX_SLICE_MB_SIZE,
+        .step_or_mask = 1,
+        .value = 1,
+        .hfi_id = HFI_PROP_MULTI_SLICE_MB_COUNT,
+        .flags = CAP_FLAG_OUTPUT_PORT,
+    },
  };
  static const u32 sm8550_vdec_input_config_params_default[] = {

drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +2 -0
index 776b21cd11b2..226894b99dcc 100644
@@ -71,6 +71,8 @@ enum hfi_rate_control {
   #define HFI_PROP_MIN_QP_PACKED            0x0300012f
   #define HFI_PROP_MAX_QP_PACKED            0x03000130
   #define HFI_PROP_IR_RANDOM_PERIOD        0x03000131
+#define HFI_PROP_MULTI_SLICE_MB_COUNT        0x03000132
+#define HFI_PROP_MULTI_SLICE_BYTES_COUNT    0x03000133
   #define HFI_PROP_LTR_COUNT            0x03000134
   #define HFI_PROP_LTR_MARK            0x03000135
   #define HFI_PROP_LTR_USE            0x03000136
drivers/media/platform/qcom/iris/iris_platform_common.h +12 -0
index c9256f2323dc..659d15166365 100644
@@ -100,6 +100,15 @@ struct platform_inst_caps {
       u32 mb_cycles_fw_vpp;
       u32 max_frame_rate;
       u32 max_operating_rate;
+    u32 max_slices_per_frame;
+    u32 max_slice_frame_rate;
+    u32 max_mb_slice_width;
+    u32 max_mb_slice_height;
+    u32 max_bytes_slice_width;
+    u32 max_bytes_slice_height;
+    u32 min_hevc_slice_width;
+    u32 min_avc_slice_width;
+    u32 min_slice_height;
   };
   enum platform_inst_fw_cap_type {
@@ -183,6 +192,9 @@ enum platform_inst_fw_cap_type {
       LAYER3_BITRATE_HEVC,
       LAYER4_BITRATE_HEVC,
       LAYER5_BITRATE_HEVC,
+    SLICE_MODE,
+    SLICE_MAX_BYTES,
+    SLICE_MAX_MB,
       INST_FW_CAP_MAX,
   };
drivers/media/platform/qcom/iris/iris_platform_qcs8300.h +9 -0
index 3cfecae80d1e..764acf71c72b 100644
@@ -17,6 +17,15 @@ static struct platform_inst_caps 
 platform_inst_cap_qcs8300 = {
       .mb_cycles_fw_vpp = 44156,
       .max_frame_rate = MAXIMUM_FPS,
       .max_operating_rate = MAXIMUM_FPS,
+    .max_slices_per_frame = 128,
+    .max_slice_frame_rate = 60,
+    .max_mb_slice_width = 4096,
+    .max_mb_slice_height = 2160,
+    .max_bytes_slice_width = 1920,
+    .max_bytes_slice_height = 1088,
+    .min_hevc_slice_width = 384,
+    .min_avc_slice_width = 192,
+    .min_slice_height = 128,
   };
   #endif
drivers/media/platform/qcom/iris/iris_platform_sm8550.h +9 -0
index 3c9dae995bb2..ef87976c2360 100644
@@ -25,6 +25,15 @@ static struct platform_inst_caps 
 platform_inst_cap_sm8550 = {
       .mb_cycles_fw_vpp = 66234,
       .max_frame_rate = MAXIMUM_FPS,
       .max_operating_rate = MAXIMUM_FPS,
+    .max_slices_per_frame = 128,
+    .max_slice_frame_rate = 60,
+    .max_mb_slice_width = 4096,
+    .max_mb_slice_height = 2160,
+    .max_bytes_slice_width = 1920,
+    .max_bytes_slice_height = 1088,
+    .min_hevc_slice_width = 384,
+    .min_avc_slice_width = 192,
+    .min_slice_height = 128,
   };
   #endif
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +0 -0
index 6e06a32822bb..39720e7af889 100644
@@ -44,6 +44,15 @@ static struct platform_inst_caps 
 platform_inst_cap_vpu2 = {
       .mb_cycles_vpp = 200,
       .max_frame_rate = MAXIMUM_FPS,

drivers/media/platform/qcom/iris/iris_platform_vpu2.c static struct platform_inst_caps · line 56

Quoted 10 lines
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +9 -0
       .max_operating_rate = MAXIMUM_FPS,
+    .max_slices_per_frame = 128,
+    .max_slice_frame_rate = 60,
+    .max_mb_slice_width = 4096,
+    .max_mb_slice_height = 2160,
+    .max_bytes_slice_width = 1920,
+    .max_bytes_slice_height = 1088,
+    .min_hevc_slice_width = 384,
+    .min_avc_slice_width = 192,
+    .min_slice_height = 128,

I do not see these values are changing for different SOC data here. Would prefer to do the macro instead of inflating the platform struct.

Quoted 3 lines

Regards,
Vikash

Thanks for the review, Vikash.
Agreed these were duplicated. In v[4], I've introduced struct platform_inst_slice_caps and moved it to iris_platform_data (one level above platform_inst_caps), since all Gen2 targets share the same encoder capability table and slice limits. A single default_slice_caps_vpu3x instance is now referenced via .slice_caps from all Gen2 targets, instead of being duplicated per-target. Used a shared struct pointer rather than a macro so a future chipset with different limits can point at its own instance without touching the others.

Quoted 4 lines
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +0 -0
   };
   static const struct icc_info iris_icc_info_vpu2[] = {