From nobody Mon Feb 9 02:33:59 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD6DA311941 for ; Tue, 4 Nov 2025 08:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243928; cv=none; b=N9p8A6g60VC75UksjhPTWDDw0W66dqcU/2pjXlXaAk+qO62rYJTis5KlX8RSW/7Hlv9mAbHp+0EhIxNfS1FNNFVRJRvwbAKB11G6E7rBcqcLs4NkNJowxwFnoKvPLiA8vA/bd6upk373M8fCqWC+3CCrIHyu8xnGn0uCl3nk2UQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243928; c=relaxed/simple; bh=tgEcZ89f9J1zb8cPHLxZO8gPRlautjCq+o2xsk4hipA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VAz2AFNPFEBVvgllNcuuAxHuloUx6ErcFYcFRH7jLdV0D0nmtpGS97tu6rlo2g/kfhVtUFKzEiUl2tizIV4YSO9gJlaZtNRIKQ+pC6jE0vPoI9hB7m1Iumrjo7ixXHiC/RkDBvxW2z2XHKHkeK/laATMwFQ2W2kNe44CHX6lIWM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Y0U9GcoE; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PdtWQYB8; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Y0U9GcoE"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PdtWQYB8" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A439N5M3667854 for ; Tue, 4 Nov 2025 08:12:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Z1m0Kr0dkc5wiGTjWy8T1DcZZ4nsJuSSzl8/gqgBkD4=; b=Y0U9GcoEmMj6h1J3 e7euhBy8rX+YS/QUe4fmFN83ssCN4NivF2giFfvt/1LUNUtnZPE5lzUjRnQ3dNSU CUy6csiUV/9LgjQoA1DkBqhRlPfRcGwevyPErPCQQD0FiRcS/DwsClzWngTwREYj 5iyhXpH6OVhzFBdnZdQFmVo40WqzaYZO0GiQAyoDyubh5kMTJDW8nc3SDq1Vd4qk Bckxh+c2wYcwwiPFc1ADaqSHYkhwzOZ5OHmr/Uuq2fv4RD28Q27PzZmJpzUj3rVR qGCM7Vph+OSLPUtnOzqj+fDCt8xeWUOiITrRU3VKLNmBfH1dtbwHJ1QJYUz775qT nZCqMA== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a70ffj6ra-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 08:12:05 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-33da21394adso6364312a91.1 for ; Tue, 04 Nov 2025 00:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762243925; x=1762848725; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Z1m0Kr0dkc5wiGTjWy8T1DcZZ4nsJuSSzl8/gqgBkD4=; b=PdtWQYB8T6ENp497C45P4E+t7WbdlTOUxiSCMQyAgRMXu/fnrYRiM2lySK/SqgX9kq 0W01wNNrK1YM+qygGEA7eqzKwTD9F14rJ5A7H7BcdRlGXk1xdtRBOJXgE0jS4BWGmrIJ E2Xwg5rzdvCXNc+4Cc3RpJJA7l7KMr9AlgyiO6ksjvEMtWuizrk0CW23tSDETOUy5iEb Vy8dGQrIP89AJ6XCmWw7pct8fMQYYQqKbOnPfmokoJpcYGgs8j7QiEmoFZ0Ff6exDdpe TdW2KjmcDWKWu31yVQ0drx3x1BpwP0rXvj38/OMfCfsTf9Ep1LYEmYBkNu4ejhR5RblQ t+aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762243925; x=1762848725; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z1m0Kr0dkc5wiGTjWy8T1DcZZ4nsJuSSzl8/gqgBkD4=; b=k74V2OXdtpIRu/9dDB2Qnxur7tiLeJC9yEug2iM8IK99RwFGcvJKtX9A7x6FZKSf6r KMCs0/Su3l1d6vmJ9N4qdPshlRuZvRdxhrPjRaWqxmI+Q0pOczoVkdoQjddHNdtZH0Xo ZWGgrbp9n3zKSvg0tuH1ThI3BWOo/tWmzkYDPtd8pNaCZ5yr/uMhNRgcgLlc+kj4c+i3 CGsp74NuTUHwoY/0LCwt/2d+8Q7kn/6GLNis4jbIyuWJWMkQoZwRCVwkC80G9Kh5p1BV VUoOmlsrlvaN5VBiKOcEKflVZWTw/3If4tUPD/MODBV4sStdrSPjt+NgWlIm7YDVSbdO ReTQ== X-Forwarded-Encrypted: i=1; AJvYcCWZkOxZSyH42db8Hx6nmhEzzCHmvQf7iK2icXV/En34kkW1QVVfrPwSQ53O7a/u+XcHyUqb+kIHQR+pqS4=@vger.kernel.org X-Gm-Message-State: AOJu0YzGDAwph1ret4k0A2Z9nXj9eLCgcYy3eMV/ZjSnDvkndUb7f+gC 1+mTSVf9G7vJ3g/UzgBJihG1GwVvqCB5Uqvy2Aj3BG+3Z42XtFSmuFMxZVmA3M0EdZOo53CD7g3 4OV7Jvfcc1wTFjPJYIT3s3r/Ej+BhZ8SFoHTvLGL9BEtc+qEagh1nlTFtAxShOLSmYAQ= X-Gm-Gg: ASbGncskVt1wU+sfEqNWcyT0Hviqw1HUredoZmb2QMOknFm4qgw9VLDhz0ek/nCycHh DMsLL853ZnfRBFEgWKKmOB9P4ykfVccinocY/qXGjlIvdzlLYwio8Y4TD4mnKfaOxyV/mxnrzUl njPPsFq3jUUOrTH8FKT0bZGXuG5G4bbrnGpl0y04NtBsfP7etaKl/UphY1jmStSd4MJl9dvQU7B wHHw+1mJwuy1Z9phD53qo2doxm4g7u1qDNYmnUmCcqxUudgmKyFFTNpC43Tp4W3YynkRZ+rFf/I 2x86dWAdMSgB9dzdq+nX3/s9Jh170gaR10A4De7VY+wGrzcXqPfb1owzdeNkyn9P7H9UI463eSZ Q0p8953TChYxBtZLP+0v4rCgh+dJAcZ4NS70umE8rE6OjQS/Y60uiU/kEWj0qYA1xktCt1dmNow == X-Received: by 2002:a17:90b:3e50:b0:340:ad5e:cd with SMTP id 98e67ed59e1d1-340ad5e0162mr16381409a91.5.1762243924846; Tue, 04 Nov 2025 00:12:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFj2KWf1Hf5n0a5HTuJmIkpr+kXPrsSF+FEblQ8RcHdMPTlmXDcUzq0sPp0IIEkZuvCOJ+H0A== X-Received: by 2002:a17:90b:3e50:b0:340:ad5e:cd with SMTP id 98e67ed59e1d1-340ad5e0162mr16381365a91.5.1762243924255; Tue, 04 Nov 2025 00:12:04 -0800 (PST) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3415a1c2f12sm3601755a91.5.2025.11.04.00.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 00:12:03 -0800 (PST) From: Wangao Wang Date: Tue, 04 Nov 2025 16:11:45 +0800 Subject: [PATCH v3 1/5] media: qcom: iris: Improve format alignment for encoder Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251104-iris_encoder_enhancements-v3-1-63b0c431b4d0@oss.qualcomm.com> References: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> In-Reply-To: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang , Neil Armstrong , quic_qiweil@quicinc.com, quic_renjiang@quicinc.com X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762243916; l=5143; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=tgEcZ89f9J1zb8cPHLxZO8gPRlautjCq+o2xsk4hipA=; b=gnvMRmgCxszox4DbwAgVs9YZGWzAkXZkzIJgToYEYLPTGmKwH8kfCCzEEB0mOXFK/yJTC9vZf alH7CJR5okTAWDp4cLVwfPkIETByn7mtQ0csqMy4kHSk8xD1KQW5ryr X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Authority-Analysis: v=2.4 cv=esbSD4pX c=1 sm=1 tr=0 ts=6909b555 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=wKEeJz3Uo1OqNUEJEIgA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: l9MMNOS9_umuyTZv0IIbi-pgilICBHTh X-Proofpoint-ORIG-GUID: l9MMNOS9_umuyTZv0IIbi-pgilICBHTh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDA2NiBTYWx0ZWRfX+9ze+WlFhuZi EFh1Q+wqh8pfIDe8E8PR6i0O8Nq3dAPLJCjak7TrfbuE0zHoVO1f5BPYg+n5rpxowUyHar64XuL C17Z4DgFkYBkoehC3SokPzpTWH7SpXB2xQlP2F8SxM7qvnli/ej4aahgqOzIHjaZe8Wd8LLzx7V gkscgIg8w9xgc0/Ml8dlHbi7TcUOPzs1fhYCGpLdnkUiLmg1X5BHtTLJ9ozf1SrgxdUd0EKf6uP KVtEFqB99ZeToNgsvCX0v9QCExMCF4cMO+W+Hw6uyfwYJ4+NzO46s25rgWVqBOgaI8YqV2ejMa2 sqAs0mwH+HWzFm23YGtLqS/fW3GTSB9oC7PIS4hzlQxy2Tr3efNIRT1NsHxX52zF2t8Of/eEIHq wgL0l9DLgM/IIHCcw3u73SsPvKkzBw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-03_06,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 priorityscore=1501 adultscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040066 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. Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Wangao Wang --- .../platform/qcom/iris/iris_hfi_gen2_command.c | 23 ++++++++++++++++--= ---- drivers/media/platform/qcom/iris/iris_instance.h | 4 ++++ drivers/media/platform/qcom/iris/iris_venc.c | 10 ++++++++-- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_command.c index 4ce71a14250832440099e4cf3835b4aedfb749e8..2469e027706fb6c9c0b95be1110= 9c3cd0f8d70ce 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 ir= is_inst *inst, u32 packet =20 static int iris_hfi_gen2_set_raw_resolution(struct iris_inst *inst, u32 pl= ane) { - u32 resolution =3D inst->fmt_src->fmt.pix_mp.width << 16 | - inst->fmt_src->fmt.pix_mp.height; + u32 resolution =3D inst->enc_raw_width << 16 | inst->enc_raw_height; u32 port =3D iris_hfi_gen2_get_port(inst, plane); =20 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 =3D iris_hfi_gen2_get_port(inst, plane); u32 bottom_offset, right_offset; u32 left_offset, top_offset; + u32 codec_align; u32 payload[2]; =20 + codec_align =3D inst->codec =3D=3D V4L2_PIX_FMT_HEVC ? 32 : 16; + if (inst->domain =3D=3D DECODER) { if (V4L2_TYPE_IS_OUTPUT(plane)) { bottom_offset =3D (inst->fmt_src->fmt.pix_mp.height - inst->crop.height= ); @@ -231,10 +233,19 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris= _inst *inst, u32 plane) top_offset =3D inst->compose.top; } } else { - bottom_offset =3D (inst->fmt_src->fmt.pix_mp.height - inst->crop.height); - right_offset =3D (inst->fmt_src->fmt.pix_mp.width - inst->crop.width); - left_offset =3D inst->crop.left; - top_offset =3D inst->crop.top; + if (V4L2_TYPE_IS_OUTPUT(plane)) { + bottom_offset =3D (inst->enc_raw_height - inst->crop.height); + right_offset =3D (inst->enc_raw_width - inst->crop.width); + left_offset =3D inst->crop.left; + top_offset =3D inst->crop.top; + } else { + bottom_offset =3D (ALIGN(inst->enc_raw_height, codec_align) - + inst->enc_raw_height); + right_offset =3D (ALIGN(inst->enc_raw_width, codec_align) - + inst->enc_raw_width); + left_offset =3D 0; + top_offset =3D 0; + } } =20 payload[0] =3D FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset; diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/med= ia/platform/qcom/iris/iris_instance.h index 5982d7adefeab80905478b32cddba7bd4651a691..fbae1662947df73bb3d10b78928= 39fa1076b7e61 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 */ =20 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; }; =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/p= latform/qcom/iris/iris_venc.c index 099bd5ed4ae0294725860305254c4cad1ec88d7e..7ad747d2272f029e69a56572a18= 8a032f898a3fb 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -62,12 +62,15 @@ int iris_venc_inst_init(struct iris_inst *inst) =20 inst->crop.left =3D 0; inst->crop.top =3D 0; - inst->crop.width =3D f->fmt.pix_mp.width; - inst->crop.height =3D f->fmt.pix_mp.height; + inst->crop.width =3D DEFAULT_WIDTH; + inst->crop.height =3D DEFAULT_HEIGHT; =20 inst->operating_rate =3D DEFAULT_FPS; inst->frame_rate =3D DEFAULT_FPS; =20 + inst->enc_raw_width =3D DEFAULT_WIDTH; + inst->enc_raw_height =3D DEFAULT_HEIGHT; + memcpy(&inst->fw_caps[0], &core->inst_fw_caps_enc[0], INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap)); =20 @@ -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 =3D iris_vpu_buf_count(inst, BUF_INPUT= ); inst->buffers[BUF_INPUT].size =3D fmt->fmt.pix_mp.plane_fmt[0].sizeimage; =20 + inst->enc_raw_width =3D f->fmt.pix_mp.width; + inst->enc_raw_height =3D f->fmt.pix_mp.height; + if (f->fmt.pix_mp.width !=3D inst->crop.width || f->fmt.pix_mp.height !=3D inst->crop.height) { inst->crop.top =3D 0; --=20 2.43.0 From nobody Mon Feb 9 02:33:59 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 150FD30F53B for ; Tue, 4 Nov 2025 08:12:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243932; cv=none; b=nC+t/yCG3ab/f4R8d7iVVdmWjypGMgHONkGiDXF5r4zF22xu1c7sdR0Vq9i/Kjna10BWBTPJJwk32pm/kDgcxLQu1h1/3mJ68JarbiLvSlfO0sm8rnfYgK2ltMLXlPyio65zbiMvbg7T1CtiFAdykqQMjE9HLqkbSpTI2FDry2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243932; c=relaxed/simple; bh=svFxfyQyVIu+Mj++Bic2ws4AviymKTzu/0y2iSS8DxY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uAiW27RzbgP9gVchs9+2SaK/go/GB1QX0H6xIVFHgepnV6rMRaQDOZ6we0UJnau3vEAZwaTbyXPW5ib5lAZuKlFQ3/PFJ0SZYZBIxC4gXEgs3YY7MN4+q0c8L9OR5WixlDhVWdespRzh1ej3+u/vu1RA05IzpLe7cx7A7OWmISU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=cj5kD4rD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=W+wttk9v; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="cj5kD4rD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="W+wttk9v" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A45HDA01061186 for ; Tue, 4 Nov 2025 08:12:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ai9Q1lBunfY/+hDWjYZOyf3Zeo/KJJa1dF19YTbqWQY=; b=cj5kD4rD8F5juCkm XwmrPBxH+mQK9AgoNZB8IBL2JbMq9Xnsw5B+HAMlHictLwM1026V+dfOtEHB34o+ xVA0uDWmpHsyp4aCs7PrAnXE5Zn1EhrSlP2Z1rZBBM8M+dlX0GFuQDdyFjmAFZ4y Q8+ZOEtGhw3G8ahZGnjmRK2p434VvxLwWO/10bhOdCIGZAgq9/YFM22Un8MalybT h6SmEzir1yt0Szatrlr9Lf6XER8JU6G9akW26HMolZ/wnrUE2h6X8MQfwV7JZrqt K4oTKsL+8j1T072tu+6XiaIQUP5uuTye0+RNJI6VogZe+oBY/yhU4sSSFSvAmdcF VDSB2A== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a7b6prewe-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 08:12:09 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-33da1f30fdfso13721421a91.3 for ; Tue, 04 Nov 2025 00:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762243929; x=1762848729; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ai9Q1lBunfY/+hDWjYZOyf3Zeo/KJJa1dF19YTbqWQY=; b=W+wttk9vcypiMFe96p1Lbl08Iom0Xu8e8VmYlGU1Q5PTvMCaoyqbj3h3s7WVm+VEEN kdcgtKoKqCWGtNkaIb3P5hWcJ+vso/GaAy10KaBceQ5aR6F0raM8T+TmQk0pK/K8Leel NKcvHKCjAC9BBXUohu2JQYm5w914i6pd9z+HCQU4w6jwv1gs4ZTX6DjJlwRPWEsDcgNi I/9jKdsSCqj78l07oEo3vDs9pY0rpwLZvNh4+RdYVeFOaBv0sEPF8eAVOKTbGvjtfsxy xIUhiJkTa0oDrjRFgBQR+WI8qNEQqfVvUTPjP6yLa/E4jcFlsHFy+jxyZmzYI2zP/jsr ApEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762243929; x=1762848729; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ai9Q1lBunfY/+hDWjYZOyf3Zeo/KJJa1dF19YTbqWQY=; b=aIqWQGNWNyqCANLeI036GMzwQSDPQslzDwNAYul6LvabLX9zrsW9al8svK/e7x40QJ o2mw7vg+1s+ZkNTQKGV/fmgke5Q7A+ZqigZO0Rn/V4/mcwr57lzaDbEgENiWJsTV98AU 7PHeBYEoBdLjnLWUpydEctRnqQGFxqIw0bz3HjrOcJWN2eg3HQxC1niGRn7hOFoC7yNw c4JPuqId+vPLOV80ViikfhwdMeaEM5j/DYr3gi8gzY5Up91Q6MLJo8iGRFCtM8EG1u5C AeOm8nSXrGfK2IXlj9pQmYw0Dz8wzDAVF36a3SYSRi2qP9QlfCNPoiQwg36Q69aBiOL/ 5+tw== X-Forwarded-Encrypted: i=1; AJvYcCV4YQxrqMYPMEMDUtV2EG2hVmqNt4qs2ATozmYZnucs5oBVlGwZRUovf4ULNyDBGj7CtaVBkdNwRooBnl4=@vger.kernel.org X-Gm-Message-State: AOJu0Yzd7S+/TYOcY+oUmzbduE7BaXBJ1UTXQoS2+5RijgYEa75cM0el YqcFVF6T1qGWcdiTcZ3/3V4EzqoZm2Qky0bWWCQKL1ub8ml2cypBZC2pzRLOW0IgyBQy/iHKg2S WX5YgGJSjhwpsiDVT80YbQXs0HpPc1yyrDoiO714mimWfXkOyp+APCn9iGCRemfXWPgg= X-Gm-Gg: ASbGncubnlJnLqNqSFRP9k3ItYnFYQh/wViXgRX+ZESZNuS7I0V4CXeb5sQhnJACrjx I+u7f6EoZy5DxeLhT867IdjzGIj4k1HyPrbGc2Ll7zpvvd9Q2q8nvn97t1c0JI6ZI4ZWzftTRxR xIETbCPy0FJWcggEKt8SDSN+UxPeUOB/tk+zLbiU78ERo4DO0gtiNyAxo6B7HE/NmVHU60bwyX+ EbstK+ymBn4lEZ4UhJdzonad0Ox7Mi/iJbU20kQXRH58aSeX7BH6NdWupAyzTxtRD/UvxcKpzfh MFH8vC3qkdTJoXy4YKWgwtNz5Z/WrJCQQdLbmI63Fv3VsXt1POQF2tgBahsq2X2nszB0zUZtgNU IypoHC98bcDejTO4aIn8E2gAC0NR9xP/jWLKf5P523Fx6ZwMZI7ImuH7nkM2iLVWwFLEUqi9UEg == X-Received: by 2002:a17:90b:2d8f:b0:33f:ebc2:645 with SMTP id 98e67ed59e1d1-3408306b990mr21754035a91.20.1762243928555; Tue, 04 Nov 2025 00:12:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IE8rXxWGnHy8DYKwIFk9Js7lIJJhS4Bf7aFc0ZuEwe0zWOPqYDegM3mkKtpHfgn2V7sxqOl0A== X-Received: by 2002:a17:90b:2d8f:b0:33f:ebc2:645 with SMTP id 98e67ed59e1d1-3408306b990mr21753985a91.20.1762243927979; Tue, 04 Nov 2025 00:12:07 -0800 (PST) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3415a1c2f12sm3601755a91.5.2025.11.04.00.12.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 00:12:07 -0800 (PST) From: Wangao Wang Date: Tue, 04 Nov 2025 16:11:46 +0800 Subject: [PATCH v3 2/5] media: qcom: iris: Add scale support for encoder Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251104-iris_encoder_enhancements-v3-2-63b0c431b4d0@oss.qualcomm.com> References: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> In-Reply-To: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang , Neil Armstrong , quic_qiweil@quicinc.com, quic_renjiang@quicinc.com X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762243916; l=9528; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=svFxfyQyVIu+Mj++Bic2ws4AviymKTzu/0y2iSS8DxY=; b=e66faaQbfNEW3YHjWJybNKgsWVJUb+nLNDawxkWrYIXCubsGb4hkF+LZKiQ7Z3c4dIwv4Cr/w 741ZZxTSk8ZBzEgEnfotAjsjMRYoM/Ly1RFBIY5ufrk5upz4+riAb37 X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDA2NiBTYWx0ZWRfX60dqMbL75p3F KErC9Gy6GX6LVOJOu2jGx/1oPVqdznflKJnBpuWfX68tFDjqejXw1QpUDo6Bm8g3K8bd3F9pF4g ZnKxdtRBxc4y2E1L0AFDsuij2f1IKCYgIFT1kmoVNJmG6nzq7GinJ/jWDUNo4HkqJvMFjA3qgWo iPhnhZUx5zG7dgAVhbOWK7Epn4AVA9bxzvsmOStj2QF+c62JAO4qF3ZroQg+35eBCjl2IEI+9co 5gQT8bg/+jAs2eW5Elm7kVmUFNvcgDbCyt150x38GPoRpHjzjmsEy3B5006ZH90TiCdhnkBNW7C zLplMsq6NRl7Uh052jaEHw42KySie24kwCW73ynQ4vGG2VCatGiaSnZqg5dfM4qXYhG01lGDu3H qRXpWIhz8Pi55XcjdOBwPfLp9rXqBA== X-Proofpoint-GUID: Yk-j37yUeNcFjsSc3NbMcTKwsZ4-BzvG X-Proofpoint-ORIG-GUID: Yk-j37yUeNcFjsSc3NbMcTKwsZ4-BzvG X-Authority-Analysis: v=2.4 cv=Y4L1cxeN c=1 sm=1 tr=0 ts=6909b559 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=Z8iH8PakIHK9AZBxCNEA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-03_06,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 suspectscore=0 phishscore=0 bulkscore=0 impostorscore=0 spamscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040066 Add members enc_scale_width, enc_scale_height to the struct iris_inst to support scale requirements. Add output width and height settings in iris_venc_s_fmt_output to enable scaling functionality. Add VPSS buffer to platform data, which the scale function requires. Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Wangao Wang --- .../platform/qcom/iris/iris_hfi_gen2_command.c | 12 +++++------ .../platform/qcom/iris/iris_hfi_gen2_response.c | 2 ++ drivers/media/platform/qcom/iris/iris_instance.h | 4 ++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 12 +++++++++++ drivers/media/platform/qcom/iris/iris_venc.c | 23 ++++++++++++++++++= +++- drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 9 +++++---- 6 files changed, 51 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_command.c index 2469e027706fb6c9c0b95be11109c3cd0f8d70ce..815e3e435fbc5a36efb633bc0cc= 330ff8e86ad47 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -194,8 +194,8 @@ static int iris_hfi_gen2_set_bitstream_resolution(struc= t iris_inst *inst, u32 pl payload_type =3D HFI_PAYLOAD_U32; } else { codec_align =3D inst->codec =3D=3D V4L2_PIX_FMT_HEVC ? 32 : 16; - resolution =3D ALIGN(inst->fmt_dst->fmt.pix_mp.width, codec_align) << 16= | - ALIGN(inst->fmt_dst->fmt.pix_mp.height, codec_align); + resolution =3D ALIGN(inst->enc_scale_width, codec_align) << 16 | + ALIGN(inst->enc_scale_height, codec_align); inst_hfi_gen2->dst_subcr_params.bitstream_resolution =3D resolution; payload_type =3D HFI_PAYLOAD_32_PACKED; } @@ -239,10 +239,10 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris= _inst *inst, u32 plane) left_offset =3D inst->crop.left; top_offset =3D inst->crop.top; } else { - bottom_offset =3D (ALIGN(inst->enc_raw_height, codec_align) - - inst->enc_raw_height); - right_offset =3D (ALIGN(inst->enc_raw_width, codec_align) - - inst->enc_raw_width); + bottom_offset =3D (ALIGN(inst->enc_scale_height, codec_align) - + inst->enc_scale_height); + right_offset =3D (ALIGN(inst->enc_scale_width, codec_align) - + inst->enc_scale_width); left_offset =3D 0; top_offset =3D 0; } diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c b/dr= ivers/media/platform/qcom/iris/iris_hfi_gen2_response.c index 2f1f118eae4f6462ab1aa1d16844b34e6e699f1e..dc3e606b6ab429a1d15536fa831= 6afb1e384d674 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c @@ -54,6 +54,8 @@ static u32 iris_hfi_gen2_buf_type_to_driver(struct iris_i= nst *inst, return BUF_SCRATCH_2; case HFI_BUFFER_PERSIST: return BUF_PERSIST; + case HFI_BUFFER_VPSS: + return BUF_VPSS; default: return 0; } diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/med= ia/platform/qcom/iris/iris_instance.h index fbae1662947df73bb3d10b7892839fa1076b7e61..5ff01dd7177fc919d0cc69553fa= dede5801592a1 100644 --- a/drivers/media/platform/qcom/iris/iris_instance.h +++ b/drivers/media/platform/qcom/iris/iris_instance.h @@ -66,6 +66,8 @@ struct iris_fmt { * @hfi_rc_type: rate control type * @enc_raw_width: raw image width for encoder instance * @enc_raw_height: raw image height for encoder instance + * @enc_scale_width: scale width for encoder instance + * @enc_scale_height: scale height for encoder instance */ =20 struct iris_inst { @@ -106,6 +108,8 @@ struct iris_inst { u32 hfi_rc_type; u32 enc_raw_width; u32 enc_raw_height; + u32 enc_scale_width; + u32 enc_scale_height; }; =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index 36d69cc73986b74534a2912524c8553970fd862e..d3306189d902a1f42666010468c= 9e4e4316a66e1 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -729,6 +729,10 @@ static const u32 sm8550_dec_op_int_buf_tbl[] =3D { BUF_DPB, }; =20 +static const u32 sm8550_enc_ip_int_buf_tbl[] =3D { + BUF_VPSS, +}; + static const u32 sm8550_enc_op_int_buf_tbl[] =3D { BUF_BIN, BUF_COMV, @@ -816,6 +820,8 @@ struct iris_platform_data sm8550_data =3D { .dec_op_int_buf_tbl =3D sm8550_dec_op_int_buf_tbl, .dec_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_dec_op_int_buf_tbl), =20 + .enc_ip_int_buf_tbl =3D sm8550_enc_ip_int_buf_tbl, + .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_ip_int_buf_tbl), .enc_op_int_buf_tbl =3D sm8550_enc_op_int_buf_tbl, .enc_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_op_int_buf_tbl), }; @@ -908,6 +914,8 @@ struct iris_platform_data sm8650_data =3D { .dec_op_int_buf_tbl =3D sm8550_dec_op_int_buf_tbl, .dec_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_dec_op_int_buf_tbl), =20 + .enc_ip_int_buf_tbl =3D sm8550_enc_ip_int_buf_tbl, + .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_ip_int_buf_tbl), .enc_op_int_buf_tbl =3D sm8550_enc_op_int_buf_tbl, .enc_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_op_int_buf_tbl), }; @@ -989,6 +997,8 @@ struct iris_platform_data sm8750_data =3D { .dec_op_int_buf_tbl =3D sm8550_dec_op_int_buf_tbl, .dec_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_dec_op_int_buf_tbl), =20 + .enc_ip_int_buf_tbl =3D sm8550_enc_ip_int_buf_tbl, + .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_ip_int_buf_tbl), .enc_op_int_buf_tbl =3D sm8550_enc_op_int_buf_tbl, .enc_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_op_int_buf_tbl), }; @@ -1077,6 +1087,8 @@ struct iris_platform_data qcs8300_data =3D { .dec_op_int_buf_tbl =3D sm8550_dec_op_int_buf_tbl, .dec_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_dec_op_int_buf_tbl), =20 + .enc_ip_int_buf_tbl =3D sm8550_enc_ip_int_buf_tbl, + .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_ip_int_buf_tbl), .enc_op_int_buf_tbl =3D sm8550_enc_op_int_buf_tbl, .enc_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8550_enc_op_int_buf_tbl), }; diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/p= latform/qcom/iris/iris_venc.c index 7ad747d2272f029e69a56572a188a032f898a3fb..f573408a3fc66e1bbc7814a8fc7= 953158e043fce 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -70,6 +70,8 @@ int iris_venc_inst_init(struct iris_inst *inst) =20 inst->enc_raw_width =3D DEFAULT_WIDTH; inst->enc_raw_height =3D DEFAULT_HEIGHT; + inst->enc_scale_width =3D DEFAULT_WIDTH; + inst->enc_scale_height =3D DEFAULT_HEIGHT; =20 memcpy(&inst->fw_caps[0], &core->inst_fw_caps_enc[0], INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap)); @@ -188,15 +190,32 @@ int iris_venc_try_fmt(struct iris_inst *inst, struct = v4l2_format *f) =20 static int iris_venc_s_fmt_output(struct iris_inst *inst, struct v4l2_form= at *f) { + const struct iris_fmt *venc_fmt; struct v4l2_format *fmt; + u32 codec_align; =20 iris_venc_try_fmt(inst, f); =20 - if (!(find_format(inst, f->fmt.pix_mp.pixelformat, f->type))) + venc_fmt =3D find_format(inst, f->fmt.pix_mp.pixelformat, f->type); + if (!venc_fmt) return -EINVAL; =20 + codec_align =3D venc_fmt->pixfmt =3D=3D V4L2_PIX_FMT_HEVC ? 32 : 16; + fmt =3D inst->fmt_dst; fmt->type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; + /* + * If output format size !=3D input format size, + * it is considered a scaling case, + * and the scaled size needs to be saved. + */ + if (f->fmt.pix_mp.width !=3D inst->fmt_src->fmt.pix_mp.width || + f->fmt.pix_mp.height !=3D inst->fmt_src->fmt.pix_mp.height) { + inst->enc_scale_width =3D f->fmt.pix_mp.width; + inst->enc_scale_height =3D f->fmt.pix_mp.height; + fmt->fmt.pix_mp.width =3D ALIGN(f->fmt.pix_mp.width, codec_align); + fmt->fmt.pix_mp.height =3D ALIGN(f->fmt.pix_mp.height, codec_align); + } fmt->fmt.pix_mp.num_planes =3D 1; fmt->fmt.pix_mp.plane_fmt[0].bytesperline =3D 0; fmt->fmt.pix_mp.plane_fmt[0].sizeimage =3D iris_get_buffer_size(inst, BUF= _OUTPUT); @@ -254,6 +273,8 @@ static int iris_venc_s_fmt_input(struct iris_inst *inst= , struct v4l2_format *f) =20 inst->enc_raw_width =3D f->fmt.pix_mp.width; inst->enc_raw_height =3D f->fmt.pix_mp.height; + inst->enc_scale_width =3D f->fmt.pix_mp.width; + inst->enc_scale_height =3D f->fmt.pix_mp.height; =20 if (f->fmt.pix_mp.width !=3D inst->crop.width || f->fmt.pix_mp.height !=3D inst->crop.height) { diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/m= edia/platform/qcom/iris/iris_vpu_buffer.c index 4463be05ce165adef6b152eb0c155d2e6a7b3c36..db5adadd1b39c06bc41ae6f1b3d= 2f924b3ebf150 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c @@ -1131,10 +1131,11 @@ static u32 iris_vpu_enc_arp_size(struct iris_inst *= inst) =20 inline bool is_scaling_enabled(struct iris_inst *inst) { - return inst->crop.left !=3D inst->compose.left || - inst->crop.top !=3D inst->compose.top || - inst->crop.width !=3D inst->compose.width || - inst->crop.height !=3D inst->compose.height; + struct v4l2_pix_format_mplane *dst_fmt =3D &inst->fmt_dst->fmt.pix_mp; + struct v4l2_pix_format_mplane *src_fmt =3D &inst->fmt_src->fmt.pix_mp; + + return dst_fmt->width !=3D src_fmt->width || + dst_fmt->height !=3D src_fmt->height; } =20 static inline --=20 2.43.0 From nobody Mon Feb 9 02:33:59 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9350331280F for ; Tue, 4 Nov 2025 08:12:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243936; cv=none; b=YmTkI4Z4VdofBibtNLPrWnjIDRbrdyWvbt/FmTn54c265qTSRrRfLes9u1CLBuHIEl2P3nOfvKyyJywfd5VF/Mi/9SY6jtQ+QDQZV3REEREHF1rwhWCaW6wVglNS7y53VcqTqkKiJmpd++zsYUA3eHjHZiwa9jjuhuzl3beysYw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243936; c=relaxed/simple; bh=o9jgvd8ifbR3z9utxRdBFlJf/j37qH4/sIxqwnCFP8g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Wnmw8OC/Z6/X+ilx+qP63NWlgQjPHPBi/fG9EE4zkG5GpnOYiy6IABSbgdsobas0FrMyWhPQaaJXlrERfYd3FJL7D0MmFOBAltAZYfe7QH9MdocUTehIlA3IdlP96l1KqY2LtSj1Qx/V9N9b5PyFNluzy3gbyQ1l27WS7jXvQ4g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=NBiUYLnk; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=V523CDkh; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="NBiUYLnk"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="V523CDkh" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A45GMB11059913 for ; Tue, 4 Nov 2025 08:12:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= yY9n6nOoq1wNPf4SZLepDE9CcpFjRgyTx4OkTbZ6Lok=; b=NBiUYLnkMvDief9K cZ7Z4EuQNUgGvCjH6HAfeDGG9glH+tUY8cm7vhO9+6Dz7HDf9ilz95EZ0eXytCej N2Fx1UFhsVduoxk5CV5GCpdIKsg4GJjfTEE8eCi7pf/oWkV6vXmxgokEMRRbd7wP 3MB62hOPb7pw2w8Vhk6KHsl6QBUZ3ASQM5RKMyPpBD58Q/LWigQ2KZ1TXa54Sl1U h5kxa1/b2a71b7ZUG42EiZ+V3D079HTEdc9UcKqAbwuh8Jbe7slg3RKt3VaQwhks 8dTMwvxOZA8Sy1b2HCia+fSjgAbifz/9kgsIpVBN/BgYY6VGcwXJqYdJJcXpY+jd QihNEw== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a7b6preww-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 08:12:13 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-340562297b9so4542987a91.1 for ; Tue, 04 Nov 2025 00:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762243933; x=1762848733; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yY9n6nOoq1wNPf4SZLepDE9CcpFjRgyTx4OkTbZ6Lok=; b=V523CDkhNkZjJTlEbi5mMEcSbxaX1jH/0nUdTZjcR3Y7EECk2L/fuDyWZqVXP2zT2Z HAqnEOFA3nNUVKI4+M32Yvvx7CB/JCa2Rz4KXBvkM8fRF7kFCvDMfrAdFgIqMI7Yjjkq GCnTgbZ+tHKWPjEmt6xP2KUVSXLK/L/pIL4X1hoJTxPEr+g6WP9bNmxjmP1iiLUGr5b/ WPuQWuiQ8rHB8LnB/Kt/msa9ERlKzYKSkoGvmkT3YhdcerlDE26M9dWaoFkCfrBmsmc/ 69l2Sm6636vQw8ZN08ZunmiIkJDBRG2P1BnJvHmt1PN5zmwQL1ejJcnHms1ogSbc1mlE cl5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762243933; x=1762848733; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yY9n6nOoq1wNPf4SZLepDE9CcpFjRgyTx4OkTbZ6Lok=; b=RfLWhFx/z4+jXr83fBlJJlK/p6LsxtkBfNE34Oi+KJFsB6ZBENSiQ9NhKsIR4shJjq J4+hd6258OfZY67dubV2myw3EeyuvFzSarPg8jGOMFvbrXlVpj2XsIfQ2uZjWjdfMIBr 6C7NjDjgIZGFKsHyBOUFRPWEFumhfhUknGgBXxndKDhku4mMD7TZFx1zY6jOAihTrkzH ghhznC2VQODjkccl6D4qn6JPwR8fDT+t2Cw6zO1/i+ezm9Ys7NiYZqaAH4BC4VDTfXys mX95krMW1AoaEZFxXRNV5whJEyXBuo1Pdkv8nbfGyva3YwyypqaHCyZRXUez/TtXVWwu b/CQ== X-Forwarded-Encrypted: i=1; AJvYcCUminLFVLG60e5Wu2fpJhnHfag8elF8H2G8Vo8kTXGTsPuT1RmAjIRmhaG18ZjKEU6GWTB49BeVLzn2zG8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1RrYch21ROnsAJyqDlBvKTMKhCGo5Rbwizrj1iTcqd+aJMxxa PAr4ij6Ls/uYiKCWmRUfbDHPGhfPwxlkG87atm485vUwU0x9L3lE5wReEgDtCcaa0Q4tTYHBMod rwo3V/NDauB0dOwdnP2IJn5XSFmuL//0tBpeXMYSGVdusI5WuWcAfgnVKKRY5Zt9Ff7I= X-Gm-Gg: ASbGncvJwc14cMbLguH+wCpLFZQdhtB3Im/daR3upDLcb8sCwCm05Z0/5DlxuOgmZqK eikOowx57KjVkWdZjN4HR6im1DUcHQgRbxonc1EjdxDWqfr+7iNhae7dFzWnpZw9375ib1Ufobm 9daD2DXmgghSB/36ZkViuhVAIeOp+z7nYF6ak/5pqLLzqFKwuqv9+q4qt0I53NcHlrm9vtkLe1Q f+uQdUpPFLnY7A3j3XIIvzRZiNksDW9Ga1XNdeJY2D8L8v9+d8SJHY1QGC2sBNVfisX2NRzQZ49 YiwNG5yZai3U22wvX3sLE6PTL7m6r35KZCL4wTVm5Vv/O1lwp9ickT6qU96RzIBN4ENZ3wS1IOC P+8LGxdwiDWRFQ4xehR9eFEQW2ZPTUPoGeA3jLdVJDiYv2O/mC/oYuG96ODzEmibSNkPJRxLWyg == X-Received: by 2002:a17:90b:2f4c:b0:33b:b673:1b07 with SMTP id 98e67ed59e1d1-341718d05cbmr2842919a91.9.1762243932825; Tue, 04 Nov 2025 00:12:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IEzzG0qeHSiJlCNoJhevT3lR0U3eYCvyDKJKKHhzwvVqJLo35fdvRWUk5lrS0aoKtrsv/CFFg== X-Received: by 2002:a17:90b:2f4c:b0:33b:b673:1b07 with SMTP id 98e67ed59e1d1-341718d05cbmr2842879a91.9.1762243932233; Tue, 04 Nov 2025 00:12:12 -0800 (PST) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3415a1c2f12sm3601755a91.5.2025.11.04.00.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 00:12:11 -0800 (PST) From: Wangao Wang Date: Tue, 04 Nov 2025 16:11:47 +0800 Subject: [PATCH v3 3/5] media: qcom: iris: Add rotation support for encoder Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251104-iris_encoder_enhancements-v3-3-63b0c431b4d0@oss.qualcomm.com> References: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> In-Reply-To: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang , Neil Armstrong , quic_qiweil@quicinc.com, quic_renjiang@quicinc.com X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762243916; l=14609; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=o9jgvd8ifbR3z9utxRdBFlJf/j37qH4/sIxqwnCFP8g=; b=4Sy+JjEkxhQGKFu2JulfsPUb1Movqf/uKhIUdeGqPWY41mdQEgkl+8RjIqnRBWV9mAMXC5C4Z dtig+eP7iF3DYzbqqcMHbwjA2Whn6M216ciTsoHr7xPIpghqoId95rJ X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDA2NiBTYWx0ZWRfX75UBFZUfcMkt qbbxXXUAtKO/hL/c1/8le+tOdbchfxQzYatLKMjNLfgWyEXW7zGQJxJnO+UyiNGspGkW+HugkrX q8S1BIE38k/kAm/bpsF6ZCmcNGUGxTVwUqe10w+/SNx6eXEZDJ9ZVueRYc1dy8dSI2l7nZyxSZ/ C0CKLVPJEuQ7BzHw5mRxU9OtpAN0ddIjGbkxlLQlF2jUl9kewcXOblhTxULG0HsYBCNmjHo6/tR 6JUaBSk6AD0fswaSH+G+e92azAouTW06FQNA+GtaFvv1B0k313w5lHFL5D5Jm0mudeAz0oyBA7R 2/Yqibi60eTG6yDhPIBwSGhcANeup8jxB1fag/99hG8zlTFpWD7PA0PMipjt+QNBUEuFmTkFsrA zMAaxHT94aymMfQeEY1UiRIvVh8ddQ== X-Proofpoint-GUID: 6PBNWhomkrwGGH6i8jNbzY0fOB3PZdkw X-Proofpoint-ORIG-GUID: 6PBNWhomkrwGGH6i8jNbzY0fOB3PZdkw X-Authority-Analysis: v=2.4 cv=Y4L1cxeN c=1 sm=1 tr=0 ts=6909b55d cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=0PQ7lrkXE1FeiLWnmyUA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-03_06,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 suspectscore=0 phishscore=0 bulkscore=0 impostorscore=0 spamscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040066 Add rotation control for encoder, enabling V4L2_CID_ROTATE and handling 90/180/270 degree rotation. Co-developed-by: Neil Armstrong Signed-off-by: Neil Armstrong Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Wangao Wang --- 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(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 754a5ad718bc37630bb861012301df7a2e7342a1..00949c207ddb0203e51df359214= bf23c3d8265d0 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_t= ype 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 pla= tform_inst_fw_cap_type cap &range, sizeof(range)); } =20 +int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id) +{ + const struct iris_hfi_command_ops *hfi_ops =3D inst->core->hfi_ops; + u32 hfi_id =3D inst->fw_caps[cap_id].hfi_id; + u32 hfi_val; + + switch (inst->fw_caps[cap_id].value) { + case 0: + hfi_val =3D HFI_ROTATION_NONE; + return 0; + case 90: + hfi_val =3D HFI_ROTATION_90; + break; + case 180: + hfi_val =3D HFI_ROTATION_180; + break; + case 270: + hfi_val =3D 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 =3D 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..3ea0a00c7587a516f19bb7307a0= eb9a60c856ab0 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_ty= pe cap_id); int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); +int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_command.c index 815e3e435fbc5a36efb633bc0cc330ff8e86ad47..2f6a3c0e51134f0ef24336a66f3= 4b4b61882554b 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 ir= is_inst *inst, u32 plane) sizeof(u32)); } =20 +static inline u32 iris_hfi_get_aligned_resolution(struct iris_inst *inst, = u32 width, u32 height) +{ + u32 codec_align =3D inst->codec =3D=3D 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 =3D to_iris_inst_hfi_gen2(inst); u32 port =3D iris_hfi_gen2_get_port(inst, plane); enum hfi_packet_payload_info payload_type; - u32 resolution, codec_align; + u32 width, height; + u32 resolution; =20 if (inst->domain =3D=3D DECODER) { - resolution =3D inst->fmt_src->fmt.pix_mp.width << 16 | - inst->fmt_src->fmt.pix_mp.height; + width =3D inst->fmt_src->fmt.pix_mp.width; + height =3D inst->fmt_src->fmt.pix_mp.height; + resolution =3D iris_hfi_get_aligned_resolution(inst, width, height); inst_hfi_gen2->src_subcr_params.bitstream_resolution =3D resolution; payload_type =3D HFI_PAYLOAD_U32; } else { - codec_align =3D inst->codec =3D=3D V4L2_PIX_FMT_HEVC ? 32 : 16; - resolution =3D ALIGN(inst->enc_scale_width, codec_align) << 16 | - ALIGN(inst->enc_scale_height, codec_align); + if (is_rotation_90_or_270(inst)) { + width =3D inst->enc_scale_height; + height =3D inst->enc_scale_width; + } else { + width =3D inst->enc_scale_width; + height =3D inst->enc_scale_height; + } + resolution =3D iris_hfi_get_aligned_resolution(inst, width, height); inst_hfi_gen2->dst_subcr_params.bitstream_resolution =3D resolution; payload_type =3D HFI_PAYLOAD_32_PACKED; } @@ -239,10 +253,17 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris= _inst *inst, u32 plane) left_offset =3D inst->crop.left; top_offset =3D inst->crop.top; } else { - bottom_offset =3D (ALIGN(inst->enc_scale_height, codec_align) - - inst->enc_scale_height); - right_offset =3D (ALIGN(inst->enc_scale_width, codec_align) - - inst->enc_scale_width); + if (is_rotation_90_or_270(inst)) { + bottom_offset =3D (ALIGN(inst->enc_scale_width, codec_align) - + inst->enc_scale_width); + right_offset =3D (ALIGN(inst->enc_scale_height, codec_align) - + inst->enc_scale_height); + } else { + bottom_offset =3D (ALIGN(inst->enc_scale_height, codec_align) - + inst->enc_scale_height); + right_offset =3D (ALIGN(inst->enc_scale_width, codec_align) - + inst->enc_scale_width); + } left_offset =3D 0; top_offset =3D 0; } diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index aa1f795f5626c1f76a32dd650302633877ce67be..4edcce7faf5e2f74bfecfdbf574= 391d5b1c9cca5 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 { }; =20 #define HFI_PROP_SEQ_HEADER_MODE 0x03000149 + +enum hfi_rotation { + HFI_ROTATION_NONE =3D 0x00000000, + HFI_ROTATION_90 =3D 0x00000001, + HFI_ROTATION_180 =3D 0x00000002, + HFI_ROTATION_270 =3D 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/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 58d05e0a112eed25faea027a34c719c89d6c3897..9a4232b1c64eea6ce909e1e3117= 69dd958b84c6e 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, }; =20 diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index d3306189d902a1f42666010468c9e4e4316a66e1..c1f83e179d441c45df8d6487dc8= 7e137e482fb63 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[] =3D { .flags =3D CAP_FLAG_OUTPUT_PORT, .set =3D iris_set_u32, }, + { + .cap_id =3D ROTATION, + .min =3D 0, + .max =3D 270, + .step_or_mask =3D 90, + .value =3D 0, + .hfi_id =3D HFI_PROP_ROTATION, + .flags =3D CAP_FLAG_OUTPUT_PORT, + .set =3D iris_set_rotation, + }, }; =20 static struct platform_inst_caps platform_inst_cap_sm8550 =3D { diff --git a/drivers/media/platform/qcom/iris/iris_utils.c b/drivers/media/= platform/qcom/iris/iris_utils.c index 85c70a62b1fd2c409fc18b28f64771cb0097a7fd..97465dfbdec1497b1111b9069fd= 56dff286b2d0e 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) =20 return 0; } + +bool is_rotation_90_or_270(struct iris_inst *inst) +{ + return inst->fw_caps[ROTATION].value =3D=3D 90 || + inst->fw_caps[ROTATION].value =3D=3D 270; +} diff --git a/drivers/media/platform/qcom/iris/iris_utils.h b/drivers/media/= platform/qcom/iris/iris_utils.h index 75740181122f5bdf93d64d3f43b3a26a9fe97919..b5705d156431a5cf59d645ce988= bc3a3c9b9c5e2 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, uns= igned 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); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/m= edia/platform/qcom/iris/iris_vpu_buffer.c index db5adadd1b39c06bc41ae6f1b3d2f924b3ebf150..1e54ace966c74956208d88f0683= 7b97b1fd48e17 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); } =20 +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 he= ight, static u32 iris_vpu_enc_bin_size(struct iris_inst *inst) { u32 num_vpp_pipes =3D inst->core->iris_platform_data->num_vpp_pipe; + u32 height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 width =3D iris_vpu_enc_get_bitstream_width(inst); u32 stage =3D inst->fw_caps[STAGE].value; - struct v4l2_format *f =3D inst->fmt_dst; - u32 height =3D f->fmt.pix_mp.height; - u32 width =3D f->fmt.pix_mp.width; u32 lcu_size; =20 if (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) @@ -676,9 +691,8 @@ u32 hfi_buffer_comv_enc(u32 frame_width, u32 frame_heig= ht, u32 lcu_size, =20 static u32 iris_vpu_enc_comv_size(struct iris_inst *inst) { - struct v4l2_format *f =3D inst->fmt_dst; - u32 height =3D f->fmt.pix_mp.height; - u32 width =3D f->fmt.pix_mp.width; + u32 height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 width =3D iris_vpu_enc_get_bitstream_width(inst); u32 num_recon =3D 1; u32 lcu_size =3D 16; =20 @@ -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 =3D inst->core->iris_platform_data->num_vpp_pipe; - struct v4l2_format *f =3D inst->fmt_dst; - u32 height =3D f->fmt.pix_mp.height; - u32 width =3D f->fmt.pix_mp.width; + u32 height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 width =3D iris_vpu_enc_get_bitstream_width(inst); u32 lcu_size =3D 16; =20 if (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) { @@ -1051,9 +1064,8 @@ u32 hfi_buffer_line_enc_vpu33(u32 frame_width, u32 fr= ame_height, bool is_ten_bit static u32 iris_vpu_enc_line_size(struct iris_inst *inst) { u32 num_vpp_pipes =3D inst->core->iris_platform_data->num_vpp_pipe; - struct v4l2_format *f =3D inst->fmt_dst; - u32 height =3D f->fmt.pix_mp.height; - u32 width =3D f->fmt.pix_mp.width; + u32 height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 width =3D iris_vpu_enc_get_bitstream_width(inst); u32 lcu_size =3D 16; =20 if (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) { @@ -1069,9 +1081,8 @@ static u32 iris_vpu_enc_line_size(struct iris_inst *i= nst) static u32 iris_vpu33_enc_line_size(struct iris_inst *inst) { u32 num_vpp_pipes =3D inst->core->iris_platform_data->num_vpp_pipe; - struct v4l2_format *f =3D inst->fmt_dst; - u32 height =3D f->fmt.pix_mp.height; - u32 width =3D f->fmt.pix_mp.width; + u32 height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 width =3D iris_vpu_enc_get_bitstream_width(inst); u32 lcu_size =3D 16; =20 if (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) { @@ -1292,9 +1303,8 @@ static inline u32 hfi_buffer_scratch1_enc(u32 frame_w= idth, u32 frame_height, static u32 iris_vpu_enc_scratch1_size(struct iris_inst *inst) { u32 num_vpp_pipes =3D inst->core->iris_platform_data->num_vpp_pipe; - struct v4l2_format *f =3D inst->fmt_dst; - u32 frame_height =3D f->fmt.pix_mp.height; - u32 frame_width =3D f->fmt.pix_mp.width; + u32 frame_height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 frame_width =3D iris_vpu_enc_get_bitstream_width(inst); u32 num_ref =3D 1; u32 lcu_size; bool is_h265; @@ -1390,9 +1400,8 @@ static inline u32 hfi_buffer_scratch2_enc(u32 frame_w= idth, u32 frame_height, =20 static u32 iris_vpu_enc_scratch2_size(struct iris_inst *inst) { - struct v4l2_format *f =3D inst->fmt_dst; - u32 frame_width =3D f->fmt.pix_mp.width; - u32 frame_height =3D f->fmt.pix_mp.height; + u32 frame_height =3D iris_vpu_enc_get_bitstream_height(inst); + u32 frame_width =3D iris_vpu_enc_get_bitstream_width(inst); u32 num_ref =3D 1; =20 return hfi_buffer_scratch2_enc(frame_width, frame_height, num_ref, --=20 2.43.0 From nobody Mon Feb 9 02:33:59 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C05083128D8 for ; Tue, 4 Nov 2025 08:12:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243940; cv=none; b=Tkqk91NMmqVKp+zq5W3eQnCNMW+CIC2Yr/BGhqeSyUaZY484P08R6J/ZeZCqZeMLvKFMJ9g+dS1JlUf2396JnOJJ1NsDHO5NqD22dWoE6hGBzYcZJtJwmT5OeK8NFodfiXXujiFhwuv5wiPgRRydVVFsxyXnhJ+WnjI8IrvfSTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243940; c=relaxed/simple; bh=fJoAPc83wR1LgHrDfr408IQ1A/7ZxGfeFvE/M2rCaic=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uD5qLVrN1adELaO9/AcIkQfRSL7ee6H7fxsk3YSdOPCH3WBC3Ks7TPKLDpOGIAl2V/ABQYshZjaxomuHpE5rFNrh+G//i3pkyagp8W6nbPoFisLAVP/i7Elk8dKGiVKhJd3jeHaiFkstlVS7dFSFBHpVoGX6+OAlYntrGfzuG7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=QkEPgSTC; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=C2UOVtVJ; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="QkEPgSTC"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="C2UOVtVJ" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A42fwSL3682791 for ; Tue, 4 Nov 2025 08:12:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ovGBUB15DEWLk0DVrQSRCkCYrN6zQfyDDY5aUsiUaHo=; b=QkEPgSTCiDSwM2az Ujb/thaUTaAwKqohEi0r2hWpU24E/K+FCqcV5IjCZLybTQlizkFjQVU0xlU2ucnw 9J6dpa5gUmlmPg8S04g1xI+AToT61YUfcgn2KyDe03Cjb+6o5Hn82DKyV/bAaeCG qrdxZEamZykavbxqpvaXVNPBe/Pduc5zb8Ry60FM3IxPwhA0/OBKZueGFEmCggaH xwn6kg83Sf/SG+9FNCs5K6Hi6RZSbeKJglejU20zzJO7ClTvYC7OnZlxoEApv8Pd TBF3iqVjZl6ZLeK0Lwg/W0c4mziVi60DUoND474SFvGz83W0+H2t84Qirzdvdc9q GlPnAw== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a6xjqtn0d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 08:12:17 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-340fb6acc39so3184646a91.0 for ; Tue, 04 Nov 2025 00:12:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762243936; x=1762848736; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ovGBUB15DEWLk0DVrQSRCkCYrN6zQfyDDY5aUsiUaHo=; b=C2UOVtVJByiYuhtGesiJQPYyrW2waYodzxBgmQAAW+SisUJMsQWmz+qho33CN1Cep/ +7iNhmnI35XbBUCTOIyHGWbfm4Fmmwbdxwoe1ShRpD8b4h4fGD9X0RkWuDNmyvpC6XvZ /vu75EDFSHsR9F13xYHZ2h0TVRU7vrxWSFkkWPEkEAwv9rAZ/jRMZx9bXUe++bAvW/vq bXETcu7H6g/hxd84IIeKxJqKyfXF/f7g02hSj3nCFlNYq5DD0lZAQll7kgoFkyy5F22u JCvTfo9QAI3KPoHpGsoZeeCvuW9NbaXnAHj3zC3eRDz5JxvFoj4O8BM20kPTAul5cSsf HpcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762243936; x=1762848736; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ovGBUB15DEWLk0DVrQSRCkCYrN6zQfyDDY5aUsiUaHo=; b=gY1M0KVVQjq785tydeWQ++DdtExh4N7PB1HPztEJksGKfHFqqqL9hD48R4xwMxqOQh JqeFN2+mfyPFTNdRTjOaGY2OTBcjA4qNDEB9BWBnLLHHMlYEFj/m7hSP08Rvl8aFaC+r O+A4rJ2iiVF1mvtkrY5xTVkf2JtCnp1m5FxIL9SoSJBGE0+Q7zfCpPCZ499DHXWNmdcT BXJKkPfyO2HLvekL8bILrCTfCWnlxD66lEyS49vMZekSfd7SFfFT8LhNQ96HGuj1+3zJ QqBeBNOH9xH/jm75KxpG443R5g6TEahX08Y+z5mgyyENyCeqj9Z35V22Ct0unLGVJH9A vJzg== X-Forwarded-Encrypted: i=1; AJvYcCU3bc+IMmQxKt7Nz3Lbz3L5gPlWQDo8Pkzib1pSHYKYc/Dpu5uRIwk0DAWMlxKC6C5r0L8JjZqhyAIun6A=@vger.kernel.org X-Gm-Message-State: AOJu0Ywz8fhqbSWqpri+sbogUAiA6UocvXO+IG6GOARRFjYOqDYCM4bv 4KfFlZ/rl3SkHTP37R96bSjb4HGMh6hyqUPhK09Wat1JjOkhSmHyZs9oAwlXjLVvx8slTF/KCsa MKp3IiHXXO/t3QB1nDtjBnMsZ3S9oiBjocLW8e3Hz9oPFrbgKm/zswvHSAceYasHZ8uA= X-Gm-Gg: ASbGnctMdMOM8pBzZU461SxLMzx7vPDuoR2tvNGVHavrS0LffomunW8DiKEiPE/b/TR EzXlcj4+VZws8/IYKLqQm6qGWshowVAxpcShNQ5uG/CNCnN+d5qy0S+J/hGdFR9eGzNW/OYYYUV mVQbVdh7awaqUeks7/ArCu3A3E2gBPz13IDXHXXpm3Fi835I6ngMC5NuZyZOnAKDGnuXzxTE3/q i1sNYL89Jl3HLsfwH7Wge0Bk/Mw3yNgdbJQGkypJRlP3DxF5udFOdEdaWUGMJvsOA9T4K4sikLX DP0G9BSdOFY4KNRGOL3k33e6vjJiUjUqGKpf4Qoj5a7cJInPbuI6BkJdDzygvnKJDZLym7cpLIM LkY5VXNSRPkGRy/WdtjBUTels/Bkpc5pUlmkQUOr+5AUEGrZU1np2yNIztVP5O9UYFQYM42Vctw == X-Received: by 2002:a17:90b:2b4d:b0:340:ec8f:82d8 with SMTP id 98e67ed59e1d1-340ec8f87fcmr10541869a91.12.1762243936479; Tue, 04 Nov 2025 00:12:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/AabkJTPh5krRwgPsv6Ln4KTaXbwzylXrpyEKBYfRobrKqMA5DOKC9cLklniqODSS0ep+Tg== X-Received: by 2002:a17:90b:2b4d:b0:340:ec8f:82d8 with SMTP id 98e67ed59e1d1-340ec8f87fcmr10541832a91.12.1762243935969; Tue, 04 Nov 2025 00:12:15 -0800 (PST) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3415a1c2f12sm3601755a91.5.2025.11.04.00.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 00:12:15 -0800 (PST) From: Wangao Wang Date: Tue, 04 Nov 2025 16:11:48 +0800 Subject: [PATCH v3 4/5] media: qcom: iris: Add flip support for encoder Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251104-iris_encoder_enhancements-v3-4-63b0c431b4d0@oss.qualcomm.com> References: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> In-Reply-To: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang , Neil Armstrong , quic_qiweil@quicinc.com, quic_renjiang@quicinc.com X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762243916; l=5542; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=fJoAPc83wR1LgHrDfr408IQ1A/7ZxGfeFvE/M2rCaic=; b=XcD4aIGY4/vv3mqzLanPyBWhYQruDFibo9YL1B+7hEEMht/D1FljFmQNW7rVE8UYjrfKUHcHk kzAv1Jc88JBAQ6sv8XVJIzelQQoSdBoRBX+5Pde5rDYk3STwbvCC3Lv X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-GUID: 3sMEzlG0enVkcvhxkXxOgyNkRGH1qwAZ X-Proofpoint-ORIG-GUID: 3sMEzlG0enVkcvhxkXxOgyNkRGH1qwAZ X-Authority-Analysis: v=2.4 cv=criWUl4i c=1 sm=1 tr=0 ts=6909b561 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=uxdc-9wEpbf47THqrzgA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDA2NiBTYWx0ZWRfX0uhZRhF/Khsw F8zxMlUrWhW5BVEFcvFpFfFy29WG7EjaUtenlMw1pKadsixv+QtIV44L07BGcu8m30/FUgGbcwf To5khkad7Pu//+1p15UbS2XhVON4rUUdxpstgd7oyBf8b9l+uDafh7WZlImPiFNw9JL8nx90MgY rw8m3p9gbijU/zz+3Xwue+ed1Cuw1X4bslzsnzt+AFo8hOYVhUvioOUoDMLVipdrQgH9Mjme7FB cn5tVgvnXbhFQ29u0p04n/V9RXGjXnM5vO+zCpD73K2Vp6sfCf3bV+dFhTE9szlnJ6p45cMbLxk EV+0SVJnKjF3ppFD2IvPRTt9bKzTIDwIVwJbkEHgmaqK5D1IJZt0GsIjQdXgN1whzJMQZ8JBJk1 LFzY3dKiQPkd4YdsySOeI1ogOSiwyg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-03_06,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1015 spamscore=0 suspectscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040066 Add support for V4L2_CID_HFLIP and V4L2_CID_VFLIP controls in encoder. Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Wangao Wang --- drivers/media/platform/qcom/iris/iris_ctrls.c | 27 ++++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 8 +++++++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen2.c | 22 ++++++++++++++++++ 5 files changed, 60 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 00949c207ddb0203e51df359214bf23c3d8265d0..8f74c12f2f41f23d75424819c70= 7aff61ea61b33 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -100,6 +100,10 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(= u32 id) return B_FRAME_QP_HEVC; case V4L2_CID_ROTATE: return ROTATION; + case V4L2_CID_HFLIP: + return HFLIP; + case V4L2_CID_VFLIP: + return VFLIP; default: return INST_FW_CAP_MAX; } @@ -189,6 +193,10 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_= type cap_id) return V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP; case ROTATION: return V4L2_CID_ROTATE; + case HFLIP: + return V4L2_CID_HFLIP; + case VFLIP: + return V4L2_CID_VFLIP; default: return 0; } @@ -917,6 +925,25 @@ int iris_set_rotation(struct iris_inst *inst, enum pla= tform_inst_fw_cap_type cap &hfi_val, sizeof(u32)); } =20 +int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type c= ap_id) +{ + const struct iris_hfi_command_ops *hfi_ops =3D inst->core->hfi_ops; + u32 hfi_id =3D inst->fw_caps[cap_id].hfi_id; + u32 hfi_val =3D HFI_DISABLE_FLIP; + + if (inst->fw_caps[HFLIP].value) + hfi_val |=3D HFI_HORIZONTAL_FLIP; + + if (inst->fw_caps[VFLIP].value) + hfi_val |=3D HFI_VERTICAL_FLIP; + + return hfi_ops->session_set_property(inst, hfi_id, + HFI_HOST_FLAGS_NONE, + iris_get_port_info(inst, cap_id), + HFI_PAYLOAD_U32_ENUM, + &hfi_val, sizeof(u32)); +} + int iris_set_properties(struct iris_inst *inst, u32 plane) { const struct iris_hfi_command_ops *hfi_ops =3D 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 3ea0a00c7587a516f19bb7307a0eb9a60c856ab0..355a592049f3fcc715a1b9df44b= 4d1398b052653 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -33,6 +33,7 @@ int iris_set_max_qp(struct iris_inst *inst, enum platform= _inst_fw_cap_type cap_i int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); +int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type c= ap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index 4edcce7faf5e2f74bfecfdbf574391d5b1c9cca5..0f92468dca91cbb2ca9b451ebce= 255180066b3a4 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -92,6 +92,14 @@ enum hfi_rotation { }; =20 #define HFI_PROP_ROTATION 0x0300014b + +enum hfi_flip { + HFI_DISABLE_FLIP =3D 0x00000000, + HFI_HORIZONTAL_FLIP =3D 0x00000001, + HFI_VERTICAL_FLIP =3D 0x00000002, +}; + +#define HFI_PROP_FLIP 0x0300014c #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/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 9a4232b1c64eea6ce909e1e311769dd958b84c6e..284d6bde6d6bcdf70016646d1c9= 2e6ae7f067efc 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -141,6 +141,8 @@ enum platform_inst_fw_cap_type { B_FRAME_QP_H264, B_FRAME_QP_HEVC, ROTATION, + HFLIP, + VFLIP, INST_FW_CAP_MAX, }; =20 diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index c1f83e179d441c45df8d6487dc87e137e482fb63..e74bdd00a4bb2f457ec9352e0ac= aebc820dae235 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -598,6 +598,28 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8550_= enc[] =3D { .flags =3D CAP_FLAG_OUTPUT_PORT, .set =3D iris_set_rotation, }, + { + .cap_id =3D HFLIP, + .min =3D 0, + .max =3D 1, + .step_or_mask =3D 1, + .value =3D 0, + .hfi_id =3D HFI_PROP_FLIP, + .flags =3D CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | + CAP_FLAG_DYNAMIC_ALLOWED, + .set =3D iris_set_flip, + }, + { + .cap_id =3D VFLIP, + .min =3D 0, + .max =3D 1, + .step_or_mask =3D 1, + .value =3D 0, + .hfi_id =3D HFI_PROP_FLIP, + .flags =3D CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | + CAP_FLAG_DYNAMIC_ALLOWED, + .set =3D iris_set_flip, + }, }; =20 static struct platform_inst_caps platform_inst_cap_sm8550 =3D { --=20 2.43.0 From nobody Mon Feb 9 02:33:59 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3FA431195B for ; Tue, 4 Nov 2025 08:12:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243944; cv=none; b=G9hk4Ize9Xt2UoJeh160s/Brm1I7YFV1o4YuAJrK7D2Gvb+b6hPne5frPR52zsCxu8Wmbn4aOF8UT71sa0SXcNa3FMXwx2tDNcrGKvP7A1R705ART5kW3f77nj9Co842CMfRpl5cFtdTB+fX6bXzcMFr0dyN1/Zorbd3QqbX0ok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762243944; c=relaxed/simple; bh=JQ5iyKLsbTvW1G+rebQp49wNfxcQrPn+UClBYzR7ixg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q6QNley8wXyBktN32io/wvW6vTAvZ03x4sM1L6ABDfBY1+p1O+DgEJv+gPldhSlYFUUSBEhBjitaR7PXt7mYe+cl2N4OfMbKpbcEQocOrRam3yzdhXKzdf5GsrgUvXpIQaKoouG3QgJnDtjDJZ2H5BQZOds0YJxiwcufQ/7n+Lc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Wk9uq8uC; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=CIUGAf3l; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Wk9uq8uC"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="CIUGAf3l" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A43EorH3616706 for ; Tue, 4 Nov 2025 08:12:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ugBW9Cv+1k8WLRXW2Hz0UY8b2KE1oQhBmaVaCghLSSQ=; b=Wk9uq8uC72ytAPiX ougrlx5Is1NjUU+RJ6Hi4rbssix+L4/ftfskr5BdyVJ9uxPWtEzZFuISmCTNblXK YOrrxbfut8+yQqz1Wm453yYjc8XmtGFbl25agKB0/BMVJ8lmF5xJVmjV94rwMcYg IVNDlNs1GjTp+Lo8nKbh4iOn/JtaxB9QEKiLnBA8RZHRFfoIHnVoUUGg0W0Ymez4 hIa9xD8PcEZTqW8n6TMp4FC4JmDhgskR6wDSZZTKdXxrvwLDqnHz7oETu0tuuyT9 rCEeBLek9j0IQVSKEgDehVpHhCMTvetbnHYtIm7HXwqRNa6aYoZjsrEuI/s3X2RY U4crBg== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a70fht6ea-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Nov 2025 08:12:22 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-33da1f30fdfso13721983a91.3 for ; Tue, 04 Nov 2025 00:12:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762243940; x=1762848740; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ugBW9Cv+1k8WLRXW2Hz0UY8b2KE1oQhBmaVaCghLSSQ=; b=CIUGAf3lWTplDFUpC8Uv4VNe+UUkkM57viVgkRuvChiJFmz/CnvXpgqAJZPdgVnUcr QVdkAQCgnNLIbkrqBU5x1mAwtGsReqW0S+5LP8eRDwRR3fayngNSqFeGzJdCkaiE//O/ O6qut2Byu6wirA9ZX6XoJhIC0DzAn8IU0qkffsM9tyxNWHBGz/+oDYCpHJXODk3SzTeR wIP81pS5fEJIp8KlkStHkZEC8vThkcEDegDB6BBhY8snZCPIiySKNdnnU3xW7DpGXpXj /GglpoJRNIn2KseTqjGnoDtMk9GEsF4A9Q+HB7OiuTP7wl7EPqt05OiV5U3X1xg5JLp9 oLXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762243940; x=1762848740; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ugBW9Cv+1k8WLRXW2Hz0UY8b2KE1oQhBmaVaCghLSSQ=; b=KuODy392QNjJnxje2qmfVBjt+lJVxYHHkT8EUwjqwWriqVRm0Z2pqQVkEoxYIYqWN2 UpTrJ3D9z/yvUKTKds42MfMNwndZhxk0PUQx1unOZnpF/5V+AyzMkjuLByEOAgAdY2Hq qfSN4mA+BUdQvF8b825QlDWFWCHMlffwxIaTJ7ZADK+25wT50HLy/QU6ZJwU+6RldR5P 8I9mLSuXwIeN+hNtD5feIsY6p+h0ADxGIT95dnpF4ook/M4pOwaD06j9EXEI1E89yC4n ror4XKO/K3KY0LbCvNX6GcU/2FehKiPFpvLK2hd6zNAPjI7Jl7Vh9nK3FVsv/QKUpVPA PB4w== X-Forwarded-Encrypted: i=1; AJvYcCXIULLswhMMsKXAofUsj8qoxWZ247TI2RZVwjnviK5FlbjSnmM6ST2QM7taumVRE5K9ToPIFI9R4LKdmB4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6Q7PMNekBCpQcgOxNfYFzsbO0NPl3xPW+h9i4T5uEiOZ6Lsxv SfEpRYeVlSZfEAYjwU8jTksQ08xZt3vjbqkxxjlQXE5H7UYx2OBD1+K6h+m3jqqo8rbjgnhAr2l cmIRRrBzqvtLB8fpI5iJRzDdb21mY3TUottH02oDF0Xb7msP3IIYdHj3c4V3SACNkQ9o= X-Gm-Gg: ASbGncu4T6X06gGpqxUqO4xCLCh99iuW8XdypVlT3aL6h6vnghOSTg9AeDEK37ZTjVE I0pVzgiXrak1m347hU9+OWGt890lohEotaIm8KInxjor+QxqJ5CEUn8RgbXXY7rxZSAjpJFuWDL 9k1H0CVUYy1IUGsY9Yg4/dyLdQ5pJh+deGmJf/xgBwZIk76U0PELObnAO3iUG/zbHUzJiAxxiL0 3/ZSbicbjEFyRutMA8jgPk+VoBFZZngJzW2xfZhazkolvwU+mndoVzXguAeKpxNp4rYtLanq4mS trdkBh3PFT62hADe6ELyREyTZcJfWpMGaFrxJI3Ec9iRjQtL0Yj1GlUXvfoXdh/RqPODDqFBzpo dMaUBQpWs1oKmcbhweVsxQ8kza2FrpnTywkdQCer5K+6bfYt6EUsTZPHKBQiIaYAkl/wUGl8QFw == X-Received: by 2002:a05:6a20:9148:b0:347:5ce0:6dda with SMTP id adf61e73a8af0-348cab898f5mr20573602637.14.1762243940174; Tue, 04 Nov 2025 00:12:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IH5bfFtNBYqevdkYDfgf7ExrTqBd5tClyrln0y016wZSMF6sJh7IQ9XqH3IOPfFY1XSFg/aIg== X-Received: by 2002:a05:6a20:9148:b0:347:5ce0:6dda with SMTP id adf61e73a8af0-348cab898f5mr20573558637.14.1762243939679; Tue, 04 Nov 2025 00:12:19 -0800 (PST) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3415a1c2f12sm3601755a91.5.2025.11.04.00.12.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 00:12:19 -0800 (PST) From: Wangao Wang Date: Tue, 04 Nov 2025 16:11:49 +0800 Subject: [PATCH v3 5/5] media: qcom: iris: Add intra refresh support for encoder Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251104-iris_encoder_enhancements-v3-5-63b0c431b4d0@oss.qualcomm.com> References: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> In-Reply-To: <20251104-iris_encoder_enhancements-v3-0-63b0c431b4d0@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang , Neil Armstrong , quic_qiweil@quicinc.com, quic_renjiang@quicinc.com X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762243916; l=6329; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=JQ5iyKLsbTvW1G+rebQp49wNfxcQrPn+UClBYzR7ixg=; b=TcK//9baQOw2TlSEFWyDTK/iUPbdeGNoVkJeKYT80uYvrw+VWtJgVt8a+NWPUMQolPWRBifcc kYREASxZLX+CE0/x/albrrqVgEf6dptdKQFNcPUbFBNJ600x8zNras3 X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA0MDA2NiBTYWx0ZWRfX1g1c5i34KVPr G5ZRHMyTVgiY8+fPZ+vAu7cX5g0+koVyClKtREZxD6llsuT0ImiDqlT/cnRvffritb8kUpHWtNc tQbDF0WYQqe0VFvjYs3vDulUqVrrF4vuhZOqEd3kvd2shJ6+hSAVfILXUwG6ODBUZZ5KSNXcZ+a 99A7pdUz1nNjCLhpjlG2EAdt4gaKcnxN9o+PDVy6JwezRZSzMNioW0Yt17R6+xIvw7DgILcXMJb 2Emp/x0zJDBlVvZCnCuNixawPNsJfskFpDsQ2QvIQciHZ3yiDXwL9tJnNGKPpsU1Ar8pkZ2/2lT DJFewfeElrCWffJPWzMhoPVgr170e5bzqh2EcmSJbCuc051fLIDEji8qgICRLkOuw70wh1cqHwh tf7y2aoR6+GiagpUvbL2iHMVj/JV+Q== X-Proofpoint-ORIG-GUID: DM193OaSawEPTICX7Fx4GYTWvbRrbvX1 X-Authority-Analysis: v=2.4 cv=CbsFJbrl c=1 sm=1 tr=0 ts=6909b566 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=-vM60OG-bLC5KXgFrusA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: DM193OaSawEPTICX7Fx4GYTWvbRrbvX1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-03_06,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 bulkscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511040066 Add support for V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD and V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE controls. Tested-by: Neil Armstrong # on SM8650-HDK Signed-off-by: Wangao Wang --- drivers/media/platform/qcom/iris/iris_ctrls.c | 33 ++++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 ++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen2.c | 19 +++++++++++++ 5 files changed, 57 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 8f74c12f2f41f23d75424819c707aff61ea61b33..14891569247318aaa7b2009b737= f077d1cb45095 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -104,6 +104,10 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(= u32 id) return HFLIP; case V4L2_CID_VFLIP: return VFLIP; + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE: + return IR_TYPE; + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD: + return IR_PERIOD; default: return INST_FW_CAP_MAX; } @@ -197,6 +201,10 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_= type cap_id) return V4L2_CID_HFLIP; case VFLIP: return V4L2_CID_VFLIP; + case IR_TYPE: + return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE; + case IR_PERIOD: + return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD; default: return 0; } @@ -944,6 +952,31 @@ int iris_set_flip(struct iris_inst *inst, enum platfor= m_inst_fw_cap_type cap_id) &hfi_val, sizeof(u32)); } =20 +int iris_set_ir_period(struct iris_inst *inst, enum platform_inst_fw_cap_t= ype cap_id) +{ + const struct iris_hfi_command_ops *hfi_ops =3D inst->core->hfi_ops; + struct vb2_queue *q =3D v4l2_m2m_get_dst_vq(inst->m2m_ctx); + u32 ir_period =3D inst->fw_caps[cap_id].value; + u32 ir_type =3D 0; + + if (inst->fw_caps[IR_TYPE].value =3D=3D + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM) { + if (vb2_is_streaming(q)) + return 0; + ir_type =3D HFI_PROP_IR_RANDOM_PERIOD; + } else if (inst->fw_caps[IR_TYPE].value =3D=3D + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC) { + ir_type =3D HFI_PROP_IR_CYCLIC_PERIOD; + } else + return -EINVAL; + + return hfi_ops->session_set_property(inst, ir_type, + HFI_HOST_FLAGS_NONE, + iris_get_port_info(inst, cap_id), + HFI_PAYLOAD_U32, + &ir_period, sizeof(u32)); +} + int iris_set_properties(struct iris_inst *inst, u32 plane) { const struct iris_hfi_command_ops *hfi_ops =3D 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 355a592049f3fcc715a1b9df44b4d1398b052653..9518803577bc39f5c1339a49878= dd0c3e8f510ad 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -34,6 +34,7 @@ int iris_set_frame_qp(struct iris_inst *inst, enum platfo= rm_inst_fw_cap_type cap int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_ty= pe cap_id); int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type c= ap_id); +int iris_set_ir_period(struct iris_inst *inst, enum platform_inst_fw_cap_t= ype cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index 0f92468dca91cbb2ca9b451ebce255180066b3a4..9e8fdddf2aef439e7f133c9bb2f= afa6d95062b02 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -70,6 +70,7 @@ enum hfi_rate_control { #define HFI_PROP_QP_PACKED 0x0300012e #define HFI_PROP_MIN_QP_PACKED 0x0300012f #define HFI_PROP_MAX_QP_PACKED 0x03000130 +#define HFI_PROP_IR_RANDOM_PERIOD 0x03000131 #define HFI_PROP_TOTAL_BITRATE 0x0300013b #define HFI_PROP_MAX_GOP_FRAMES 0x03000146 #define HFI_PROP_MAX_B_FRAMES 0x03000147 @@ -108,6 +109,7 @@ enum hfi_flip { #define HFI_PROP_BUFFER_MARK 0x0300016c #define HFI_PROP_RAW_RESOLUTION 0x03000178 #define HFI_PROP_TOTAL_PEAK_BITRATE 0x0300017C +#define HFI_PROP_IR_CYCLIC_PERIOD 0x0300017E #define HFI_PROP_COMV_BUFFER_COUNT 0x03000193 #define HFI_PROP_END 0x03FFFFFF =20 diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 284d6bde6d6bcdf70016646d1c92e6ae7f067efc..30b98e769ad34c2b63dd63e7714= bfeaa5b4f162c 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -143,6 +143,8 @@ enum platform_inst_fw_cap_type { ROTATION, HFLIP, VFLIP, + IR_TYPE, + IR_PERIOD, INST_FW_CAP_MAX, }; =20 diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index e74bdd00a4bb2f457ec9352e0acaebc820dae235..ce54aac766e2bf76fa2de64c884= 724ca63f05dcb 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -620,6 +620,25 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8550_= enc[] =3D { CAP_FLAG_DYNAMIC_ALLOWED, .set =3D iris_set_flip, }, + { + .cap_id =3D IR_TYPE, + .min =3D V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM, + .max =3D V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC, + .step_or_mask =3D BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RAND= OM) | + BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC), + .value =3D V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM, + .flags =3D CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + }, + { + .cap_id =3D IR_PERIOD, + .min =3D 0, + .max =3D INT_MAX, + .step_or_mask =3D 1, + .value =3D 0, + .flags =3D CAP_FLAG_OUTPUT_PORT | + CAP_FLAG_DYNAMIC_ALLOWED, + .set =3D iris_set_ir_period, + }, }; =20 static struct platform_inst_caps platform_inst_cap_sm8550 =3D { --=20 2.43.0