From nobody Fri Dec 19 15:49:43 2025 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 B1E722C0F78 for ; Thu, 6 Nov 2025 03:30:49 +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=1762399851; cv=none; b=DBI3EBSocDgT9rLZJXi8DGYqlgWlIOJqqBvCXizFjLLD/1aIuhdPVvn+5CfP9a5jTJlgHrYKdrJYkOgtH76VNJu6OsECnaiWGqfxW8UXbLnQKmB9B9Tpl0vaXco0xQ+9cZGWm2dBauGTKGI8/lNAW701J9tlLYhnE+ycrXA+9HE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762399851; c=relaxed/simple; bh=qJb7NKtP7BXOcePFVLUH4KlNlOEuEnolQugxAYnTO7c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GJFHNkQAnhwGH5IonR7yAPPlSQ1eM93LnGZHRqVkG2YwysBSC3Sq6NRE0B/dgsvHNd692PWzM1tjsi5eagxbSU+YUCBSoXV74MoWSlwp6wVPwrR0eDJg/GkKz1Nvjweq9+Uc+CT9+dEvIgAC6tHM/i02YhV2mvfr+Qfa5/gqxYo= 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=ZsgkFQzV; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=LVDzCZBC; 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="ZsgkFQzV"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="LVDzCZBC" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A5KFAR31656876 for ; Thu, 6 Nov 2025 03:30:49 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= OvPKp/XZNM2PzOQ7/u/SpcYLmO4fMzfvUCxKd6PJgI8=; b=ZsgkFQzVmth4pPMJ e3c4LOduI3mQbqUFCP9tQJ7VyplHKRGU4JaYzN40auyfTI4fvnj3dLschWW1rS6i DrCexryDJTJn2cZQRsGAmMYoo4GiGqXaorNIigMCqZqdW4LGkOZXIc/6S+KaaHMl snoP5+9Z5Se1wOI8BzZ/NS8hkeErR8Kfh1ORXBM5IogLaKQqFbWp2HuXBY0g5nAF Nk1pWxPtU/f7lbemtiGHVcUb+zN2IQ9IkmtV6K0qtyaLdk0XhjbYME7iHl6bt8EW RlvA0DmBumSC2hxDcj40Lg8q2ZoCTksUvoTMDQ9Mk6WaDfCOUwsv8QsGPXzOjtfZ I3R/5A== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a8831a6se-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 06 Nov 2025 03:30:48 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-29555415c09so6691065ad.0 for ; Wed, 05 Nov 2025 19:30:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762399848; x=1763004648; 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=OvPKp/XZNM2PzOQ7/u/SpcYLmO4fMzfvUCxKd6PJgI8=; b=LVDzCZBC0gZPjcMAfxDDp+c3cKIGIW0u+hBESGAPlkawDXwPMopnylq8wqBsXZuluM vjJAbWGS3Je7iuYY6EGRoQDk7YE3RdT+o39H2CNYRRTOPBSgJyOfoD7iJxDZfiABud18 tYZVPQCNnh8vAzqNSGmCQQSeMSv7kjA/uG7xdEDslr8LSy4RCzzO7DKpa694mKmCiC3K +VUDJPKrwqTMxrXaqn8y9TndxNJaWJSOm/PLkyXGelhYpMZ4HVH6Ozwe60Txqpz+SBe4 6iNVqT8mpxWjUcZiERFzAfX0qg8va7nrcSYaVUe7MtUOkLglmVMWX9+/CncraVvwhzdf Pqng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762399848; x=1763004648; 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=OvPKp/XZNM2PzOQ7/u/SpcYLmO4fMzfvUCxKd6PJgI8=; b=uSlwqEE49KVre1rozpv4FzDsDHUhlsxyPTMcM4oOS9OraWGCyWondqnznrXVpf5jen OqOav6P9Rua8LYNAuCm0CNtuD5s9MwmQVAlXBIBi9TQztxJMtm3VNL57+hYO3mgrlFOs x7HcL7rYUO4nUF5kCFL4SoAeygGWIjLbnrLY2wOBnPDY0n7AbQJYTB7goQQFHI0p2Azk EsPeuBZ5mEe5GnWMcfq/T0PnUs+xlsFUqPZJplCnVl7Ht6cIwJxR78mGiRvn7Yp7Qzwf G786IveK2/Y22ls7kScvLdd3yrTnpp5rbRlL7Yi+cZwAjXco4RmPfzyZD2AzZZcfKHuS VJ3w== X-Forwarded-Encrypted: i=1; AJvYcCVDGdjDIZNrVhdMDt3QxRshR8NavXuuM/j0+cJoeot8iIKUiyA2M/fUYDXfv1A4P8SxlU0mjcwAVYXvWcs=@vger.kernel.org X-Gm-Message-State: AOJu0YxWxzuMmqjheBuP6T7TX+UCHK4ba3nARvMn+J+kEeid1mjXIYpP maXBWZdYeLMh+Le/0TVGUnUWWMCjmRoWflGZvvm5i/DMEDI7OGFcS7tK3WNu3JczpG2s1E2Fij6 7TTESS8CBko++dQKYWuqJ+sm3bYnHjbrNMkbxkqV5CfB8kXM6f2uGyzCFVqJLm3e6NOA= X-Gm-Gg: ASbGncthd+l2YusvTcqwYtiBel4u9zMqqiPsYuqjjrBobwHDreK2EndYFMqvhGfVauk V1d6IG3CdsYtK8hrfV5R8aKuDK/uUyE67JgjN3UHEnLkTE8X8OndT5UnC0hcThJ10tjWrJpxuV6 wrdpPGimBTnbr2b8qnEBHBnaxY59kYnBZ+EfKrv8SCLSNoNdoNYNqSncN8XC6Bhk1F2mR6+czmd 67Ai/vlAxZkCG3eN0m2GmdeFs/XPri5CaNWF2NSIMWUeGcjKQk8GJGD941u47jLjbYKpeAVzfVb JOJEsMO/bVzmPGU1gt41x+IVMFdFrGvpGv1mPDuG25yiQunv9LnC93nJDVHKyU9D6AtmMqPuTne t/brZTJuKxnRQaU5M9jNk8En1To5dgwz5+g7/X4xUvavhx021noLVTgTRhLhkuvwxIw5+WvN+7A == X-Received: by 2002:a17:903:1b6f:b0:295:5132:1aa5 with SMTP id d9443c01a7336-2962ae9ae81mr75418855ad.55.1762399848177; Wed, 05 Nov 2025 19:30:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEv2NP3ANxlqrvF/FIb5iVXRiT3DT25+JxcO10XbpL3VFfkhhp2sKCiW4RWCuurF5kPljO4oA== X-Received: by 2002:a17:903:1b6f:b0:295:5132:1aa5 with SMTP id d9443c01a7336-2962ae9ae81mr75418435ad.55.1762399847641; Wed, 05 Nov 2025 19:30:47 -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 d9443c01a7336-29651cd0060sm10361925ad.108.2025.11.05.19.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 19:30:47 -0800 (PST) From: Wangao Wang Date: Thu, 06 Nov 2025 11:30:34 +0800 Subject: [PATCH v4 2/6] media: qcom: iris: Improve crop_offset handling 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: <20251106-iris_encoder_enhancements-v4-2-5d6cff963f1b@oss.qualcomm.com> References: <20251106-iris_encoder_enhancements-v4-0-5d6cff963f1b@oss.qualcomm.com> In-Reply-To: <20251106-iris_encoder_enhancements-v4-0-5d6cff963f1b@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=1762399836; l=2880; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=qJb7NKtP7BXOcePFVLUH4KlNlOEuEnolQugxAYnTO7c=; b=2F6gp3sW6wOu+3Uds/IHQam6HdnLR0lRJdvIzRoHsFpQui/qgQ4rWcpsu89ySa/C81Irt0yKc GjmXJC+lqF8Dc7asip64hLvk+T4KewN78GMDVeXHsIlIk402wLffpIT X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-ORIG-GUID: vfA8pKTrIm1uvCrPaNxUy-kvm_4Y684O X-Proofpoint-GUID: vfA8pKTrIm1uvCrPaNxUy-kvm_4Y684O X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA2MDAyNiBTYWx0ZWRfX+ncwFThIEXnJ ZHMnZ3ha5f8Bm0/wcxCvOrefm2cMoBcbu1nerbGq+oA29v7pNxejZIbB26hqgf3qfTqCdmlXXLw HSCsNwP2fh2nixUdyanQXaWt+k6HzJDWRBRiNn77B09zjTwlbEFBzj6Ai3ZUYbGk5qFY02lKPjC leaCFSNPWRw35U/GmtUPhDeOAJSPLLLvHPd0gF1h3EcTonZbEa+T87pF2fNgO0l1XAqalNvwWq+ fZ2LVzolS3knQtyMs5KirO/g5GtS6xODm1H8xigq/7ixyRw8If4roSlUKM37fQ58FKKPx4u+FBD cQH+D81TONMI/P1nds6g7x7Lwm7MjqcwG+9HWxXMYDUSQrCWMlThydSp4iPRyCxZ0dmsb9PPMM9 pnOjCls+OqoEzZNJnvfMv3vWqrE7YA== X-Authority-Analysis: v=2.4 cv=Mdhhep/f c=1 sm=1 tr=0 ts=690c1668 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=ZGEL9ByRZDbVprvkw1YA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R: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-05_09,2025-11-03_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 suspectscore=0 spamscore=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-2511060026 The setting of HFI_PROP_CROP_OFFSETS for the OUTPUT port is correct, but on the CAPTURE port it is used to inform the firmware about the ROI, so crop_offset needs to be handled accordingly. Signed-off-by: Wangao Wang --- .../media/platform/qcom/iris/iris_hfi_gen2_command.c | 18 ++++++++++++++= ---- drivers/media/platform/qcom/iris/iris_venc.c | 4 ++-- 2 files changed, 16 insertions(+), 6 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 aaa79dfe2db281bb77be7274233f093b0086b5d4..69034e1ea8eb64440646776a40d= cc657453916db 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -215,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= ); @@ -230,10 +233,17 @@ 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_dst->fmt.pix_mp.height - inst->enc_raw_heig= ht); - right_offset =3D (inst->fmt_dst->fmt.pix_mp.width - inst->enc_raw_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 (inst->fmt_dst->fmt.pix_mp.height - inst->enc_raw_hei= ght); + right_offset =3D (inst->fmt_dst->fmt.pix_mp.width - 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_venc.c b/drivers/media/p= latform/qcom/iris/iris_venc.c index 50a3eb975a2523abf1c2df128a66a762a1ed35c6..7ad747d2272f029e69a56572a18= 8a032f898a3fb 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -62,8 +62,8 @@ 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 2.43.0