Add members enc_raw_width, enc_raw_height to the struct iris_inst to
support codec alignment requirements.
HFI_PROP_CROP_OFFSETS is used to inform the firmware of the region
of interest, rather than indicating that the codec supports crop.
Therefore, the crop handling has been corrected accordingly.
Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
---
.../media/platform/qcom/iris/iris_hfi_gen2_command.c | 18 ++++++++++++------
drivers/media/platform/qcom/iris/iris_instance.h | 4 ++++
drivers/media/platform/qcom/iris/iris_venc.c | 10 +++++++---
3 files changed, 23 insertions(+), 9 deletions(-)
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 4ce71a14250832440099e4cf3835b4aedfb749e8..ada9b4d298ef10ac47a573061369828a1e150f85 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -168,8 +168,7 @@ static int iris_hfi_gen2_session_set_property(struct iris_inst *inst, u32 packet
static int iris_hfi_gen2_set_raw_resolution(struct iris_inst *inst, u32 plane)
{
- u32 resolution = inst->fmt_src->fmt.pix_mp.width << 16 |
- inst->fmt_src->fmt.pix_mp.height;
+ u32 resolution = inst->enc_raw_width << 16 | inst->enc_raw_height;
u32 port = iris_hfi_gen2_get_port(inst, plane);
return iris_hfi_gen2_session_set_property(inst,
@@ -216,8 +215,11 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane)
u32 port = iris_hfi_gen2_get_port(inst, plane);
u32 bottom_offset, right_offset;
u32 left_offset, top_offset;
+ u32 codec_align;
u32 payload[2];
+ codec_align = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
+
if (inst->domain == DECODER) {
if (V4L2_TYPE_IS_OUTPUT(plane)) {
bottom_offset = (inst->fmt_src->fmt.pix_mp.height - inst->crop.height);
@@ -231,10 +233,14 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane)
top_offset = inst->compose.top;
}
} else {
- bottom_offset = (inst->fmt_src->fmt.pix_mp.height - inst->crop.height);
- right_offset = (inst->fmt_src->fmt.pix_mp.width - inst->crop.width);
- left_offset = inst->crop.left;
- top_offset = inst->crop.top;
+ if (V4L2_TYPE_IS_CAPTURE(plane)) {
+ bottom_offset = (ALIGN(inst->enc_raw_height, codec_align) -
+ inst->enc_raw_height);
+ right_offset = (ALIGN(inst->enc_raw_width, codec_align) -
+ inst->enc_raw_width);
+ left_offset = inst->crop.left;
+ top_offset = inst->crop.top;
+ }
}
payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset;
diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
index 5982d7adefeab80905478b32cddba7bd4651a691..fbae1662947df73bb3d10b7892839fa1076b7e61 100644
--- a/drivers/media/platform/qcom/iris/iris_instance.h
+++ b/drivers/media/platform/qcom/iris/iris_instance.h
@@ -64,6 +64,8 @@ struct iris_fmt {
* @frame_rate: frame rate of current instance
* @operating_rate: operating rate of current instance
* @hfi_rc_type: rate control type
+ * @enc_raw_width: raw image width for encoder instance
+ * @enc_raw_height: raw image height for encoder instance
*/
struct iris_inst {
@@ -102,6 +104,8 @@ struct iris_inst {
u32 frame_rate;
u32 operating_rate;
u32 hfi_rc_type;
+ u32 enc_raw_width;
+ u32 enc_raw_height;
};
#endif
diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
index 099bd5ed4ae0294725860305254c4cad1ec88d7e..6adadc89e360a6e4bebe1f839d38892990e10fa2 100644
--- a/drivers/media/platform/qcom/iris/iris_venc.c
+++ b/drivers/media/platform/qcom/iris/iris_venc.c
@@ -68,6 +68,9 @@ int iris_venc_inst_init(struct iris_inst *inst)
inst->operating_rate = DEFAULT_FPS;
inst->frame_rate = DEFAULT_FPS;
+ inst->enc_raw_width = DEFAULT_WIDTH;
+ inst->enc_raw_height = DEFAULT_HEIGHT;
+
memcpy(&inst->fw_caps[0], &core->inst_fw_caps_enc[0],
INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap));
@@ -249,6 +252,9 @@ static int iris_venc_s_fmt_input(struct iris_inst *inst, struct v4l2_format *f)
inst->buffers[BUF_INPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);
inst->buffers[BUF_INPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;
+ inst->enc_raw_width = f->fmt.pix_mp.width;
+ inst->enc_raw_height = f->fmt.pix_mp.height;
+
if (f->fmt.pix_mp.width != inst->crop.width ||
f->fmt.pix_mp.height != inst->crop.height) {
inst->crop.top = 0;
@@ -329,9 +335,7 @@ int iris_venc_s_selection(struct iris_inst *inst, struct v4l2_selection *s)
inst->crop.top = s->r.top;
inst->crop.width = s->r.width;
inst->crop.height = s->r.height;
- inst->fmt_dst->fmt.pix_mp.width = inst->crop.width;
- inst->fmt_dst->fmt.pix_mp.height = inst->crop.height;
- return iris_venc_s_fmt_output(inst, inst->fmt_dst);
+ return 0;
default:
return -EINVAL;
}
--
2.43.0
On 10/31/2025 3:20 PM, Wangao Wang wrote:
> Add members enc_raw_width, enc_raw_height to the struct iris_inst to
> support codec alignment requirements.
>
> HFI_PROP_CROP_OFFSETS is used to inform the firmware of the region
> of interest, rather than indicating that the codec supports crop.
> Therefore, the crop handling has been corrected accordingly.
>
> Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com>
> ---
> .../media/platform/qcom/iris/iris_hfi_gen2_command.c | 18 ++++++++++++------
> drivers/media/platform/qcom/iris/iris_instance.h | 4 ++++
> drivers/media/platform/qcom/iris/iris_venc.c | 10 +++++++---
> 3 files changed, 23 insertions(+), 9 deletions(-)
>
> 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 4ce71a14250832440099e4cf3835b4aedfb749e8..ada9b4d298ef10ac47a573061369828a1e150f85 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> @@ -168,8 +168,7 @@ static int iris_hfi_gen2_session_set_property(struct iris_inst *inst, u32 packet
>
> static int iris_hfi_gen2_set_raw_resolution(struct iris_inst *inst, u32 plane)
> {
> - u32 resolution = inst->fmt_src->fmt.pix_mp.width << 16 |
> - inst->fmt_src->fmt.pix_mp.height;
> + u32 resolution = inst->enc_raw_width << 16 | inst->enc_raw_height;
> u32 port = iris_hfi_gen2_get_port(inst, plane);
>
> return iris_hfi_gen2_session_set_property(inst,
> @@ -216,8 +215,11 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane)
> u32 port = iris_hfi_gen2_get_port(inst, plane);
> u32 bottom_offset, right_offset;
> u32 left_offset, top_offset;
> + u32 codec_align;
> u32 payload[2];
>
> + codec_align = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
> +
> if (inst->domain == DECODER) {
> if (V4L2_TYPE_IS_OUTPUT(plane)) {
> bottom_offset = (inst->fmt_src->fmt.pix_mp.height - inst->crop.height);
> @@ -231,10 +233,14 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane)
> top_offset = inst->compose.top;
> }
> } else {
> - bottom_offset = (inst->fmt_src->fmt.pix_mp.height - inst->crop.height);
> - right_offset = (inst->fmt_src->fmt.pix_mp.width - inst->crop.width);
> - left_offset = inst->crop.left;
> - top_offset = inst->crop.top;
> + if (V4L2_TYPE_IS_CAPTURE(plane)) {
> + bottom_offset = (ALIGN(inst->enc_raw_height, codec_align) -
> + inst->enc_raw_height);
> + right_offset = (ALIGN(inst->enc_raw_width, codec_align) -
> + inst->enc_raw_width);
> + left_offset = inst->crop.left;
> + top_offset = inst->crop.top;
As you mentioned this prop is not meant to set CROP so left offset and top
offset can be assigned to 0 directly?
> + }
> }
>
> payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset;
> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
> index 5982d7adefeab80905478b32cddba7bd4651a691..fbae1662947df73bb3d10b7892839fa1076b7e61 100644
> --- a/drivers/media/platform/qcom/iris/iris_instance.h
> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
> @@ -64,6 +64,8 @@ struct iris_fmt {
> * @frame_rate: frame rate of current instance
> * @operating_rate: operating rate of current instance
> * @hfi_rc_type: rate control type
> + * @enc_raw_width: raw image width for encoder instance
> + * @enc_raw_height: raw image height for encoder instance
> */
>
> struct iris_inst {
> @@ -102,6 +104,8 @@ struct iris_inst {
> u32 frame_rate;
> u32 operating_rate;
> u32 hfi_rc_type;
> + u32 enc_raw_width;
> + u32 enc_raw_height;
> };
>
> #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
> index 099bd5ed4ae0294725860305254c4cad1ec88d7e..6adadc89e360a6e4bebe1f839d38892990e10fa2 100644
> --- a/drivers/media/platform/qcom/iris/iris_venc.c
> +++ b/drivers/media/platform/qcom/iris/iris_venc.c
> @@ -68,6 +68,9 @@ int iris_venc_inst_init(struct iris_inst *inst)
> inst->operating_rate = DEFAULT_FPS;
> inst->frame_rate = DEFAULT_FPS;
>
> + inst->enc_raw_width = DEFAULT_WIDTH;
> + inst->enc_raw_height = DEFAULT_HEIGHT;
> +
> memcpy(&inst->fw_caps[0], &core->inst_fw_caps_enc[0],
> INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap));
>
> @@ -249,6 +252,9 @@ static int iris_venc_s_fmt_input(struct iris_inst *inst, struct v4l2_format *f)
> inst->buffers[BUF_INPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);
> inst->buffers[BUF_INPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;
>
> + inst->enc_raw_width = f->fmt.pix_mp.width;
> + inst->enc_raw_height = f->fmt.pix_mp.height;
> +
> if (f->fmt.pix_mp.width != inst->crop.width ||
> f->fmt.pix_mp.height != inst->crop.height) {
> inst->crop.top = 0;
> @@ -329,9 +335,7 @@ int iris_venc_s_selection(struct iris_inst *inst, struct v4l2_selection *s)
> inst->crop.top = s->r.top;
> inst->crop.width = s->r.width;
> inst->crop.height = s->r.height;
> - inst->fmt_dst->fmt.pix_mp.width = inst->crop.width;
> - inst->fmt_dst->fmt.pix_mp.height = inst->crop.height;
> - return iris_venc_s_fmt_output(inst, inst->fmt_dst);
why is this removed ?
Thanks,
Dikshita
> + return 0;
> default:
> return -EINVAL;
> }
>
Hi Wangao,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 13863a59e410cab46d26751941980dc8f088b9b3]
url: https://github.com/intel-lab-lkp/linux/commits/Wangao-Wang/media-qcom-iris-Improve-format-alignment-for-encoder/20251031-175803
base: 13863a59e410cab46d26751941980dc8f088b9b3
patch link: https://lore.kernel.org/r/20251031-iris_encoder_enhancements-v2-1-319cd75cbb45%40oss.qualcomm.com
patch subject: [PATCH v2 1/5] media: qcom: iris: Improve format alignment for encoder
config: riscv-allmodconfig (https://download.01.org/0day-ci/archive/20251103/202511031813.c8c7mkXF-lkp@intel.com/config)
compiler: clang version 22.0.0git (https://github.com/llvm/llvm-project d2625a438020ad35330cda29c3def102c1687b1b)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251103/202511031813.c8c7mkXF-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202511031813.c8c7mkXF-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:236:7: warning: variable 'left_offset' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
236 | if (V4L2_TYPE_IS_CAPTURE(plane)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/videodev2.h:182:2: note: expanded from macro 'V4L2_TYPE_IS_CAPTURE'
182 | (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type))
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:246:43: note: uninitialized use occurs here
246 | payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset;
| ^~~~~~~~~~~
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:236:3: note: remove the 'if' if its condition is always true
236 | if (V4L2_TYPE_IS_CAPTURE(plane)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:236:7: warning: variable 'left_offset' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]
236 | if (V4L2_TYPE_IS_CAPTURE(plane)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/videodev2.h:182:3: note: expanded from macro 'V4L2_TYPE_IS_CAPTURE'
182 | (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type))
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/videodev2.h:165:2: note: expanded from macro 'V4L2_TYPE_IS_VALID'
165 | ((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE &&\
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
166 | (type) <= V4L2_BUF_TYPE_META_OUTPUT)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:246:43: note: uninitialized use occurs here
246 | payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset;
| ^~~~~~~~~~~
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:236:7: note: remove the '&&' if its condition is always true
236 | if (V4L2_TYPE_IS_CAPTURE(plane)) {
| ^
include/uapi/linux/videodev2.h:182:3: note: expanded from macro 'V4L2_TYPE_IS_CAPTURE'
182 | (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type))
| ^
include/uapi/linux/videodev2.h:165:2: note: expanded from macro 'V4L2_TYPE_IS_VALID'
165 | ((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE &&\
| ^
>> drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:236:7: warning: variable 'left_offset' is used uninitialized whenever '&&' condition is false [-Wsometimes-uninitialized]
236 | if (V4L2_TYPE_IS_CAPTURE(plane)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/videodev2.h:182:3: note: expanded from macro 'V4L2_TYPE_IS_CAPTURE'
182 | (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type))
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/videodev2.h:165:3: note: expanded from macro 'V4L2_TYPE_IS_VALID'
165 | ((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE &&\
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:246:43: note: uninitialized use occurs here
246 | payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset;
| ^~~~~~~~~~~
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:236:7: note: remove the '&&' if its condition is always true
236 | if (V4L2_TYPE_IS_CAPTURE(plane)) {
| ^
include/uapi/linux/videodev2.h:182:3: note: expanded from macro 'V4L2_TYPE_IS_CAPTURE'
182 | (V4L2_TYPE_IS_VALID(type) && !V4L2_TYPE_IS_OUTPUT(type))
| ^
include/uapi/linux/videodev2.h:165:3: note: expanded from macro 'V4L2_TYPE_IS_VALID'
165 | ((type) >= V4L2_BUF_TYPE_VIDEO_CAPTURE &&\
| ^
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c:217:17: note: initialize the variable 'left_offset' to silence this warning
217 | u32 left_offset, top_offset;
| ^
| = 0
3 warnings generated.
vim +236 drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
211
212 static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane)
213 {
214 struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);
215 u32 port = iris_hfi_gen2_get_port(inst, plane);
216 u32 bottom_offset, right_offset;
217 u32 left_offset, top_offset;
218 u32 codec_align;
219 u32 payload[2];
220
221 codec_align = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16;
222
223 if (inst->domain == DECODER) {
224 if (V4L2_TYPE_IS_OUTPUT(plane)) {
225 bottom_offset = (inst->fmt_src->fmt.pix_mp.height - inst->crop.height);
226 right_offset = (inst->fmt_src->fmt.pix_mp.width - inst->crop.width);
227 left_offset = inst->crop.left;
228 top_offset = inst->crop.top;
229 } else {
230 bottom_offset = (inst->fmt_dst->fmt.pix_mp.height - inst->compose.height);
231 right_offset = (inst->fmt_dst->fmt.pix_mp.width - inst->compose.width);
232 left_offset = inst->compose.left;
233 top_offset = inst->compose.top;
234 }
235 } else {
> 236 if (V4L2_TYPE_IS_CAPTURE(plane)) {
237 bottom_offset = (ALIGN(inst->enc_raw_height, codec_align) -
238 inst->enc_raw_height);
239 right_offset = (ALIGN(inst->enc_raw_width, codec_align) -
240 inst->enc_raw_width);
241 left_offset = inst->crop.left;
242 top_offset = inst->crop.top;
243 }
244 }
245
246 payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset;
247 payload[1] = FIELD_PREP(GENMASK(31, 16), right_offset) | bottom_offset;
248 inst_hfi_gen2->src_subcr_params.crop_offsets[0] = payload[0];
249 inst_hfi_gen2->src_subcr_params.crop_offsets[1] = payload[1];
250
251 return iris_hfi_gen2_session_set_property(inst,
252 HFI_PROP_CROP_OFFSETS,
253 HFI_HOST_FLAGS_NONE,
254 port,
255 HFI_PAYLOAD_64_PACKED,
256 &payload,
257 sizeof(u64));
258 }
259
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.