From mboxrd@z Thu Jan 1 00:00:00 1970 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 6E89C254841 for ; Fri, 14 Nov 2025 03:11:12 +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=1763089874; cv=none; b=jyprxE+dcoXYpm9OWTXlanqMF/6dwTZbTM+Xr3FQ708aJF0EKhUmfhRWO5pZA070Q8ZbnwZxXPUlAzzmXQ3AHmYqFGM7yeTzl5tYpJI4FmDjHuHzzSb+DjdNA6fuxuYmr4ez0sraYyOvRA+kv+zVXh+sEXnqkItuNuYwvG0BoxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763089874; c=relaxed/simple; bh=N+lXfS+h75q3UY+fVI5mCZ5Y22WmQkMvX7JwoqZwoAQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=raXVWBxPQGLr8MOfZYWXNCaoTOf0PMZzRVDVaItmNsDFQF4bAzrBnvSLgRIlpa0UVugjvaSfTSLQymPrRk2IzMqIzE3Tlcle/9aHXoJQX4Nj4I8QEVpdQ+5riGrt4nMtAgLWUc/Xy690f8cxX6mc2n1xZCulo+ul40/aVlsMtbE= 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=hbIPfG+m; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=T9H6hJUK; 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="hbIPfG+m"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="T9H6hJUK" 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 5ADMbRt81631450 for ; Fri, 14 Nov 2025 03:11:11 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= EpCPhfZHViyrEGxLAAC7R6Rt+0rXawz53+v5Rmp3lUI=; b=hbIPfG+mAsy3ZpmW u6cJPIeKrkbO6joJy1tJ1ZN1AmTeytIlBUrbzjmWf/Tl8oBMSS08HMl6mqxp38a0 zAFCGKquBEPt5ME2/6TuDMyrJchSq8iOmdvSLz5BaTUgyVBAtEnUCx95GnL9Oesh JD05kdHaYM6UqIejb83bEvKW92zODfa5QnpEeAAnC8mnpLyfxnIqk/+Fk+AsxE27 hJY5QOOt/B4/jx9JU6GAcOyEp8AG1ei47PXJTdkGIqlF6YGk0RwkjA5rcEh6TIMN Wri1xLXipuP7EbTqUVKfZBZtt2RQ6qpnLDwt2cnC0CYz6nYDWd+ktg9B7ulOupTs eGw0kA== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4adr9d8mtt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 14 Nov 2025 03:11:11 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-7aa9f595688so2865548b3a.2 for ; Thu, 13 Nov 2025 19:11:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1763089870; x=1763694670; 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=EpCPhfZHViyrEGxLAAC7R6Rt+0rXawz53+v5Rmp3lUI=; b=T9H6hJUKx8jdpamDLI6QL4m7W/8p1ZqfcvdWVfoy4zWqbBqUsLO5jbumg9W942D56b bVBoalvFA920jrJCbQznIpxgicUbbDoS68IDI6LXaZT7uQTyVgp7eEkWb7Qjqf8nWPm7 rM9ux+0RNLx3NalJZSPPnJ00AM2lTs/bWpS4EQ3diMCsF3q07onnCHLv1YFd0rYIgX/w lUFCPU+bhsElMPVy9m5tdH9IPzxuQ9PhHTDZAZnJiGCmaLdWy//pVpWPsr5cO5oc/2US 3a6HRh2VSdJppAth0Svq3/TbGCDrxG2y8aFCBCvl0VB1CTL/drJ+vSLNdo99JEyBUxBs UfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763089870; x=1763694670; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EpCPhfZHViyrEGxLAAC7R6Rt+0rXawz53+v5Rmp3lUI=; b=nRDu/f9GiF7EiX9yRW3wajowKbEbzJe19G8l8I27QtN8WEwRiKspAiPhx5JadzJJPU NZSTeV6oK1yiH1ArUgKaeYQFZ9vzOiy2X6D4xwi5mtCibiuF2FmsuGrHThOQkpiNcdcn 1NyQnGIR38oJtHjO5PbEXeO/JfKXkX5u62CWheObBiuMyIB/Nptwm0iO1vlwt7QthJbz 4TF3q5e2vF1IutMN/ksAgMWR3O0g3sxdO4Pl9fB6QNemNvVjcCJ4G3JgO56jkMQxARDT DVAgzZexxKdnSiva6TsWa1rL2VmwST8urqUTg2txWbAMW7uQ9w9Ik7a1RxknTV3xGozC nd2g== X-Forwarded-Encrypted: i=1; AJvYcCXCjKfxNvjNC8ooRMwm9KLEmR5NoFAhUyXeZXSv7hX3ZpoHMVqUXlN2SfbhUAHAS+5lahbI7Je3XoRKVfI=@vger.kernel.org X-Gm-Message-State: AOJu0YwZe3OLUWAcEGsflCMBWe81kDwQsPC1CWuB1avRkWI7v+HqDRTk ujux/AqGI9zgKpMDXVmzYVOWVSkcv0ZPeNHyfIu58W79DUY/PRy0fu61ncqOowO+wBsNIdFJ5rZ 71OkZiAo2cCdWYFDjxrP6y4I4Q/u9iBsSZ8rgwgUEtzqzoIsL9PmS5xeiFwVeX9zKRyg= X-Gm-Gg: ASbGncsJWDuuJZ8/6mL93490WuDFVfKDGvZ+kkU853OmJpY6nNimh38k4QZY/wdH6Ol PKm/M/PJ64+VWn/HZqQYc6ZcuPEa2k9jTVu6cw22aw7QqNLIXEQFU1Z8W5+Id2mxSBOXeUwsK7Y ICLKNIztqSURsFAtILA/Wqc3HiBYw/NDgUy9p5VYfN475mK6Mv5s4OxfF01JTUhZ3QNbVKbySvp uImFmn9wd3Qv+s/8LcIDp+h/wH3MKWrEdYdysfr9llLcFK+wXjNqhsryR+d3i6ZYxEx6BDDQpgO e4v49OYtqOvq1FMfYtTpucs8EWV6Kl++sdmnRTyKC99O6QQ+raMpER7QKqfyxG3TCigzNc6rlq8 yAg5lKWAXUgK3ju7DuewInU3P1BshDatGDZZUIeEyAZYruRp69hAwm3hvP3fOEg9guV06Ow9mZh halSfIXMfW X-Received: by 2002:a05:6a20:6a21:b0:342:a261:e2bc with SMTP id adf61e73a8af0-35b9f7802fdmr2393617637.10.1763089870334; Thu, 13 Nov 2025 19:11:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IEByt/YnJC8UImZHFW2IHOtUBhlJhhnk9FlWz7pgABAyEcJcAFKXFvnd6hkwgZSwPjj4UBvHw== X-Received: by 2002:a05:6a20:6a21:b0:342:a261:e2bc with SMTP id adf61e73a8af0-35b9f7802fdmr2393577637.10.1763089869767; Thu, 13 Nov 2025 19:11:09 -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 d2e1a72fcca58-7b92714e298sm3598555b3a.34.2025.11.13.19.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 19:11:09 -0800 (PST) From: Wangao Wang Date: Fri, 14 Nov 2025 11:08:59 +0800 Subject: [PATCH v6 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: 7bit Message-Id: <20251114-iris_encoder_enhancements-v6-2-d6d35a92635d@oss.qualcomm.com> References: <20251114-iris_encoder_enhancements-v6-0-d6d35a92635d@oss.qualcomm.com> In-Reply-To: <20251114-iris_encoder_enhancements-v6-0-d6d35a92635d@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=1763089858; l=2964; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=N+lXfS+h75q3UY+fVI5mCZ5Y22WmQkMvX7JwoqZwoAQ=; b=C+soZyehMFoq7OZ6xSqp4YsD1PBaO8egsolYdKpTMbXI3OSrrky7+1R9TAtwyXACd2pwUciYU 7Tfh8+5JhruDJRxYFxIDVgHL8YvG1ihloATL8whan22wR8KpCVSEeAk X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-GUID: 15Z0py5141CUhQ3Bowry9Ql5XrAmqiXO X-Authority-Analysis: v=2.4 cv=Rdidyltv c=1 sm=1 tr=0 ts=69169dcf cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=FFraBxrx14SkMf4OJSEA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: 15Z0py5141CUhQ3Bowry9Ql5XrAmqiXO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE0MDAyMyBTYWx0ZWRfX/EpddnxjNDEU xGZ8sGYGpt5kuA9ax8SqCnTHvDGXzcRWqYR7c0NIfacuchhXG77mQ1eOLUCW2y1sNZDTtNiWkpw LiqZEEzIPhnCXDtyyULMwTlT5KnuhUGTd/PS1NsGlR56qm5QHOs7VcsYWFLwC8Dg2m9oyGTiAK+ hquVJ+s+8zxUIQFA2Vh7aS5iN6tpstSqkEkCen2SCcrykSsSA2fjUqAYvQ/X3YnpT3PKUxk8S3M za5xKnmMgKL27yBR43eZXmat2Skll/dcs07V/aatAs8qKjIUmf9VIfVHPzP2qVZfyEExKZq0YFp 0sYgh+y2jp8pXhhhY/Jp8zQT+rrbvI9Hrv1EacUG1AOouL7VXn37HpdPNkW16asaKN/cgwQtn23 UQGHIKx3C+MYPRYnRwJMV9+iMEOZbg== 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-13_07,2025-11-13_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 adultscore=0 impostorscore=0 bulkscore=0 spamscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511140023 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 region of interest, so crop_offset needs to be handled accordingly. Reviewed-by: Dikshita Agarwal Signed-off-by: Wangao Wang --- .../media/platform/qcom/iris/iris_hfi_gen2_command.c | 20 +++++++++++++++----- drivers/media/platform/qcom/iris/iris_venc.c | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c index b5ae3d4745c6a7b354ab8907aacd532b81b48aab..8250e0d6f0a8916f3389be60dba762f3b4f3c690 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -215,7 +215,7 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane) u32 port = iris_hfi_gen2_get_port(inst, plane); u32 bottom_offset, right_offset; u32 left_offset, top_offset; - u32 payload[2]; + u32 payload[2], codec_align; if (inst->domain == DECODER) { if (V4L2_TYPE_IS_OUTPUT(plane)) { @@ -230,10 +230,20 @@ static int iris_hfi_gen2_set_crop_offsets(struct iris_inst *inst, u32 plane) top_offset = inst->compose.top; } } else { - bottom_offset = (inst->fmt_src->fmt.pix_mp.height - inst->crop.height); - right_offset = (inst->fmt_src->fmt.pix_mp.width - inst->crop.width); - left_offset = inst->crop.left; - top_offset = inst->crop.top; + codec_align = inst->codec == V4L2_PIX_FMT_HEVC ? 32 : 16; + if (V4L2_TYPE_IS_OUTPUT(plane)) { + bottom_offset = (inst->enc_raw_height - inst->crop.height); + right_offset = (inst->enc_raw_width - inst->crop.width); + left_offset = inst->crop.left; + top_offset = inst->crop.top; + } else { + bottom_offset = (ALIGN(inst->fmt_dst->fmt.pix_mp.height, codec_align) - + inst->fmt_dst->fmt.pix_mp.height); + right_offset = (ALIGN(inst->fmt_dst->fmt.pix_mp.width, codec_align) - + inst->fmt_dst->fmt.pix_mp.width); + left_offset = 0; + top_offset = 0; + } } payload[0] = FIELD_PREP(GENMASK(31, 16), left_offset) | top_offset; diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c index 07ffcd4d20969c8c33084dc8b03156913e8c89fc..71f4263ada898ce8333086db59e386e91b34ed60 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) inst->crop.left = 0; inst->crop.top = 0; - inst->crop.width = f->fmt.pix_mp.width; - inst->crop.height = f->fmt.pix_mp.height; + inst->crop.width = DEFAULT_WIDTH; + inst->crop.height = DEFAULT_HEIGHT; inst->operating_rate = DEFAULT_FPS; inst->frame_rate = DEFAULT_FPS; -- 2.43.0