| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <a4e2609a-0fef-41a3-baa4-5d7297b186a9@oss.qualcomm.com>
Date: Fri, 7 Nov 2025 14:15:09 +0530
From: Dikshita Agarwal <dikshita.agarwal@....qualcomm.com>
To: Wangao Wang <wangao.wang@....qualcomm.com>,
Vikash Garodia <vikash.garodia@....qualcomm.com>,
Abhinav Kumar <abhinav.kumar@...ux.dev>,
Bryan O'Donoghue <bod@...nel.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: linux-media@...r.kernel.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org,
Neil Armstrong <neil.armstrong@...aro.org>, quic_qiweil@...cinc.com,
quic_renjiang@...cinc.com
Subject: Re: [PATCH v4 4/6] media: qcom: iris: Add rotation support for
encoder
On 11/6/2025 9:00 AM, Wangao Wang wrote:
> Add rotation control for encoder, enabling V4L2_CID_ROTATE and handling
> 90/180/270 degree rotation.
>
> Co-developed-by: Neil Armstrong <neil.armstrong@...aro.org>
> Signed-off-by: Neil Armstrong <neil.armstrong@...aro.org>
> Tested-by: Neil Armstrong <neil.armstrong@...aro.org> # on SM8650-HDK
> Signed-off-by: Wangao Wang <wangao.wang@....qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_ctrls.c | 34 +++++++++++++++
> drivers/media/platform/qcom/iris/iris_ctrls.h | 1 +
> .../platform/qcom/iris/iris_hfi_gen2_command.c | 41 ++++++++++++-----
> .../platform/qcom/iris/iris_hfi_gen2_defines.h | 9 ++++
> .../platform/qcom/iris/iris_platform_common.h | 1 +
> .../media/platform/qcom/iris/iris_platform_gen2.c | 10 +++++
> drivers/media/platform/qcom/iris/iris_utils.c | 6 +++
> drivers/media/platform/qcom/iris/iris_utils.h | 1 +
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 51 +++++++++++++---------
> 9 files changed, 123 insertions(+), 31 deletions(-)
>
Reviewed-by: Dikshita Agarwal <dikshita.agarwal@....qualcomm.com>
Thanks,
Dikshita
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
> index 754a5ad718bc37630bb861012301df7a2e7342a1..00949c207ddb0203e51df359214bf23c3d8265d0 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.c
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
> @@ -98,6 +98,8 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
> return B_FRAME_QP_H264;
> case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP:
> return B_FRAME_QP_HEVC;
> + case V4L2_CID_ROTATE:
> + return ROTATION;
> default:
> return INST_FW_CAP_MAX;
> }
> @@ -185,6 +187,8 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
> return V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP;
> case B_FRAME_QP_HEVC:
> return V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP;
> + case ROTATION:
> + return V4L2_CID_ROTATE;
> default:
> return 0;
> }
> @@ -883,6 +887,36 @@ int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
> &range, sizeof(range));
> }
>
> +int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> + u32 hfi_val;
> +
> + switch (inst->fw_caps[cap_id].value) {
> + case 0:
> + hfi_val = HFI_ROTATION_NONE;
> + return 0;
> + case 90:
> + hfi_val = HFI_ROTATION_90;
> + break;
> + case 180:
> + hfi_val = HFI_ROTATION_180;
> + break;
> + case 270:
> + hfi_val = HFI_ROTATION_270;
> + break;
> + default:
> + 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_val, sizeof(u32));
> +}
> +
> int iris_set_properties(struct iris_inst *inst, u32 plane)
> {
> const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h
> index 30af333cc4941e737eb1ae83a6944b4192896e23..3ea0a00c7587a516f19bb7307a0eb9a60c856ab0 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.h
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h
> @@ -32,6 +32,7 @@ int iris_set_min_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_i
> int iris_set_max_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
> int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
> int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
> +int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
> int iris_set_properties(struct iris_inst *inst, u32 plane);
>
> #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> index 815e3e435fbc5a36efb633bc0cc330ff8e86ad47..2f6a3c0e51134f0ef24336a66f34b4b61882554b 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> @@ -180,22 +180,36 @@ static int iris_hfi_gen2_set_raw_resolution(struct iris_inst *inst, u32 plane)
> sizeof(u32));
> }
>
> +static inline u32 iris_hfi_get_aligned_resolution(struct iris_inst *inst, u32 width, u32 height)
> +{
> + u32 codec_align = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
> +
> + return (ALIGN(width, codec_align) << 16 | ALIGN(height, codec_align));
> +}
> +
> static int iris_hfi_gen2_set_bitstream_resolution(struct iris_inst *inst, u32 plane)
> {
> struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);
> u32 port = iris_hfi_gen2_get_port(inst, plane);
> enum hfi_packet_payload_info payload_type;
> - u32 resolution, codec_align;
> + u32 width, height;
> + u32 resolution;
>
> if (inst->domain == DECODER) {
> - resolution = inst->fmt_src->fmt.pix_mp.width << 16 |
> - inst->fmt_src->fmt.pix_mp.height;
> + width = inst->fmt_src->fmt.pix_mp.width;
> + height = inst->fmt_src->fmt.pix_mp.height;
> + resolution = iris_hfi_get_aligned_resolution(inst, width, height);
> inst_hfi_gen2->src_subcr_params.bitstream_resolution = resolution;
> payload_type = HFI_PAYLOAD_U32;
> } else {
> - codec_align = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
> - resolution = ALIGN(inst->enc_scale_width, codec_align) << 16 |
> - ALIGN(inst->enc_scale_height, codec_align);
> + if (is_rotation_90_or_270(inst)) {
> + width = inst->enc_scale_height;
> + height = inst->enc_scale_width;
> + } else {
> + width = inst->enc_scale_width;
> + height = inst->enc_scale_height;
> + }
> + resolution = iris_hfi_get_aligned_resolution(inst, width, height);
> inst_hfi_gen2->dst_subcr_params.bitstream_resolution = resolution;
> payload_type = HFI_PAYLOAD_32_PACKED;
> }
> @@ -239,10 +253,17 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane)
> left_offset = inst->crop.left;
> top_offset = inst->crop.top;
> } else {
> - bottom_offset = (ALIGN(inst->enc_scale_height, codec_align) -
> - inst->enc_scale_height);
> - right_offset = (ALIGN(inst->enc_scale_width, codec_align) -
> - inst->enc_scale_width);
> + if (is_rotation_90_or_270(inst)) {
> + bottom_offset = (ALIGN(inst->enc_scale_width, codec_align) -
> + inst->enc_scale_width);
> + right_offset = (ALIGN(inst->enc_scale_height, codec_align) -
> + inst->enc_scale_height);
> + } else {
> + bottom_offset = (ALIGN(inst->enc_scale_height, codec_align) -
> + inst->enc_scale_height);
> + right_offset = (ALIGN(inst->enc_scale_width, codec_align) -
> + inst->enc_scale_width);
> + }
> left_offset = 0;
> top_offset = 0;
> }
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
> index aa1f795f5626c1f76a32dd650302633877ce67be..4edcce7faf5e2f74bfecfdbf574391d5b1c9cca5 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
> @@ -83,6 +83,15 @@ enum hfi_seq_header_mode {
> };
>
> #define HFI_PROP_SEQ_HEADER_MODE 0x03000149
> +
> +enum hfi_rotation {
> + HFI_ROTATION_NONE = 0x00000000,
> + HFI_ROTATION_90 = 0x00000001,
> + HFI_ROTATION_180 = 0x00000002,
> + HFI_ROTATION_270 = 0x00000003,
> +};
> +
> +#define HFI_PROP_ROTATION 0x0300014b
> #define HFI_PROP_SIGNAL_COLOR_INFO 0x03000155
> #define HFI_PROP_PICTURE_TYPE 0x03000162
> #define HFI_PROP_DEC_DEFAULT_HEADER 0x03000168
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index 58d05e0a112eed25faea027a34c719c89d6c3897..9a4232b1c64eea6ce909e1e311769dd958b84c6e 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -140,6 +140,7 @@ enum platform_inst_fw_cap_type {
> P_FRAME_QP_HEVC,
> B_FRAME_QP_H264,
> B_FRAME_QP_HEVC,
> + ROTATION,
> INST_FW_CAP_MAX,
> };
>
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
> index d3306189d902a1f42666010468c9e4e4316a66e1..c1f83e179d441c45df8d6487dc87e137e482fb63 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
> +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
> @@ -588,6 +588,16 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = {
> .flags = CAP_FLAG_OUTPUT_PORT,
> .set = iris_set_u32,
> },
> + {
> + .cap_id = ROTATION,
> + .min = 0,
> + .max = 270,
> + .step_or_mask = 90,
> + .value = 0,
> + .hfi_id = HFI_PROP_ROTATION,
> + .flags = CAP_FLAG_OUTPUT_PORT,
> + .set = iris_set_rotation,
> + },
> };
>
> static struct platform_inst_caps platform_inst_cap_sm8550 = {
> diff --git a/drivers/media/platform/qcom/iris/iris_utils.c b/drivers/media/platform/qcom/iris/iris_utils.c
> index 85c70a62b1fd2c409fc18b28f64771cb0097a7fd..97465dfbdec1497b1111b9069fd56dff286b2d0e 100644
> --- a/drivers/media/platform/qcom/iris/iris_utils.c
> +++ b/drivers/media/platform/qcom/iris/iris_utils.c
> @@ -124,3 +124,9 @@ int iris_check_core_mbps(struct iris_inst *inst)
>
> return 0;
> }
> +
> +bool is_rotation_90_or_270(struct iris_inst *inst)
> +{
> + return inst->fw_caps[ROTATION].value == 90 ||
> + inst->fw_caps[ROTATION].value == 270;
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_utils.h b/drivers/media/platform/qcom/iris/iris_utils.h
> index 75740181122f5bdf93d64d3f43b3a26a9fe97919..b5705d156431a5cf59d645ce988bc3a3c9b9c5e2 100644
> --- a/drivers/media/platform/qcom/iris/iris_utils.h
> +++ b/drivers/media/platform/qcom/iris/iris_utils.h
> @@ -51,5 +51,6 @@ void iris_helper_buffers_done(struct iris_inst *inst, unsigned int type,
> int iris_wait_for_session_response(struct iris_inst *inst, bool is_flush);
> int iris_check_core_mbpf(struct iris_inst *inst);
> int iris_check_core_mbps(struct iris_inst *inst);
> +bool is_rotation_90_or_270(struct iris_inst *inst);
>
> #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index db5adadd1b39c06bc41ae6f1b3d2f924b3ebf150..1e54ace966c74956208d88f06837b97b1fd48e17 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -556,6 +556,22 @@ static u32 iris_vpu_dec_scratch1_size(struct iris_inst *inst)
> iris_vpu_dec_line_size(inst);
> }
>
> +static inline u32 iris_vpu_enc_get_bitstream_width(struct iris_inst *inst)
> +{
> + if (is_rotation_90_or_270(inst))
> + return inst->fmt_dst->fmt.pix_mp.height;
> + else
> + return inst->fmt_dst->fmt.pix_mp.width;
> +}
> +
> +static inline u32 iris_vpu_enc_get_bitstream_height(struct iris_inst *inst)
> +{
> + if (is_rotation_90_or_270(inst))
> + return inst->fmt_dst->fmt.pix_mp.width;
> + else
> + return inst->fmt_dst->fmt.pix_mp.height;
> +}
> +
> static inline u32 size_bin_bitstream_enc(u32 width, u32 height,
> u32 rc_type)
> {
> @@ -638,10 +654,9 @@ static inline u32 hfi_buffer_bin_enc(u32 width, u32 height,
> static u32 iris_vpu_enc_bin_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> + u32 height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 width = iris_vpu_enc_get_bitstream_width(inst);
> u32 stage = inst->fw_caps[STAGE].value;
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 height = f->fmt.pix_mp.height;
> - u32 width = f->fmt.pix_mp.width;
> u32 lcu_size;
>
> if (inst->codec == V4L2_PIX_FMT_HEVC)
> @@ -676,9 +691,8 @@ u32 hfi_buffer_comv_enc(u32 frame_width, u32 frame_height, u32 lcu_size,
>
> static u32 iris_vpu_enc_comv_size(struct iris_inst *inst)
> {
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 height = f->fmt.pix_mp.height;
> - u32 width = f->fmt.pix_mp.width;
> + u32 height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 width = iris_vpu_enc_get_bitstream_width(inst);
> u32 num_recon = 1;
> u32 lcu_size = 16;
>
> @@ -958,9 +972,8 @@ u32 hfi_buffer_non_comv_enc(u32 frame_width, u32 frame_height,
> static u32 iris_vpu_enc_non_comv_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 height = f->fmt.pix_mp.height;
> - u32 width = f->fmt.pix_mp.width;
> + u32 height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 width = iris_vpu_enc_get_bitstream_width(inst);
> u32 lcu_size = 16;
>
> if (inst->codec == V4L2_PIX_FMT_HEVC) {
> @@ -1051,9 +1064,8 @@ u32 hfi_buffer_line_enc_vpu33(u32 frame_width, u32 frame_height, bool is_ten_bit
> static u32 iris_vpu_enc_line_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 height = f->fmt.pix_mp.height;
> - u32 width = f->fmt.pix_mp.width;
> + u32 height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 width = iris_vpu_enc_get_bitstream_width(inst);
> u32 lcu_size = 16;
>
> if (inst->codec == V4L2_PIX_FMT_HEVC) {
> @@ -1069,9 +1081,8 @@ static u32 iris_vpu_enc_line_size(struct iris_inst *inst)
> static u32 iris_vpu33_enc_line_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 height = f->fmt.pix_mp.height;
> - u32 width = f->fmt.pix_mp.width;
> + u32 height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 width = iris_vpu_enc_get_bitstream_width(inst);
> u32 lcu_size = 16;
>
> if (inst->codec == V4L2_PIX_FMT_HEVC) {
> @@ -1292,9 +1303,8 @@ static inline u32 hfi_buffer_scratch1_enc(u32 frame_width, u32 frame_height,
> static u32 iris_vpu_enc_scratch1_size(struct iris_inst *inst)
> {
> u32 num_vpp_pipes = inst->core->iris_platform_data->num_vpp_pipe;
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 frame_height = f->fmt.pix_mp.height;
> - u32 frame_width = f->fmt.pix_mp.width;
> + u32 frame_height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 frame_width = iris_vpu_enc_get_bitstream_width(inst);
> u32 num_ref = 1;
> u32 lcu_size;
> bool is_h265;
> @@ -1390,9 +1400,8 @@ static inline u32 hfi_buffer_scratch2_enc(u32 frame_width, u32 frame_height,
>
> static u32 iris_vpu_enc_scratch2_size(struct iris_inst *inst)
> {
> - struct v4l2_format *f = inst->fmt_dst;
> - u32 frame_width = f->fmt.pix_mp.width;
> - u32 frame_height = f->fmt.pix_mp.height;
> + u32 frame_height = iris_vpu_enc_get_bitstream_height(inst);
> + u32 frame_width = iris_vpu_enc_get_bitstream_width(inst);
> u32 num_ref = 1;
>
> return hfi_buffer_scratch2_enc(frame_width, frame_height, num_ref,
>
Powered by blists - more mailing lists