From nobody Fri Dec 19 15:49:43 2025 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 56C29245021 for ; Thu, 6 Nov 2025 03:30:58 +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=1762399860; cv=none; b=K42+AK/tSyJDuGZQWGUUdqppNWb/qrYbCrqUKxQ2bOXDMk0FYybk2vyD8KsAHOFhaL9da33H59BAD5IHv7Kal93Bq52zgNxma+I1bSqqfH/hUH+6CcvdwZMby76cQAkhB8xbHUgvb6WY2IcMoJ4Eof3RbCoPa0J4JJA9tinsGKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762399860; c=relaxed/simple; bh=o9jgvd8ifbR3z9utxRdBFlJf/j37qH4/sIxqwnCFP8g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ELfpR/mN3lce4JM4zUQ3IBWEUmXoIB46ANf6lu/u+CJcin3oIyenyQv98LJkvWTjlIFMcLRfxqOOVDmPQY+aDcwv730C1XpY94krR9u8Ux+9QU5ZvIIPWbBYGU6HFK589DVwY17Zy/s0Pc7IfvqOYJ7UJTVk6VCSAqMnnnEcMlI= 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=noW29noD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ab54APEK; 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="noW29noD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ab54APEK" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5A5KF5kJ1805103 for ; Thu, 6 Nov 2025 03:30:57 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=noW29noDjmbKZkzc iHPLQbpOd6ghftXovgQeW8zlLVoh9rmRpOq9b0ExXwOs4GWqoCRqCCz6NfB2lywk RrHjh0Ls3dUwXrJ/WqbHD6CBSu+JMfNvZJYh4nEpHAmrGwuA5eSHEipsefCxq0Kj t8lGuIqnGtT5NAUC7oaF9BCq+abUmab27SKa6ppAyLwBoZwpHO4HtTkrXcAGLgxz 95QPwjGG6hj83ohr+kuJKd0DHkLnFHPu2EayvEUH6GvKJQ/0x8DiHcCWTPTUd3dI gVLlcsgTDj7dnlMQvTV5avcEQkA7o+DppsypI606Aq7ggrN3XrszhhFCXdw6RsIO jeJG9w== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a8c8s992d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 06 Nov 2025 03:30:57 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-27c62320f16so7864065ad.1 for ; Wed, 05 Nov 2025 19:30:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1762399856; x=1763004656; 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=Ab54APEKYZPrk3pjjZ7BARFUEUZt0jBSpERpgzqzz1LjfRKv2lLMVlFYdK+JQ/tIGZ BH4WrGjaTHTw8T3BQBMeKRo8o+Rl8LxF+Yiqw0+XIrZ1eMeu324nciR/ka5AgMzfBbgu 2F3sskMI/PHr/ojI4TrhXfhSfRTbdiIbLrQqo0aMc4qNAJbjZ86Q7aSHrzvY151T58bd dfsnghtkjtyQjoZGaQrN1lWrEqwJW5OnH9y8kLv8OUGAmhpcKUIVWJipTruGOgCbpX+/ SFX1OqQLums9IlQQxpvtwmWzPuYHW/MMy9EMQpqRH6u6Cticg9uweU1ArD6pemcAXlca JKUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762399856; x=1763004656; 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=MVRjBWSwF6njUAu8dGSQqS2DB7HSvUNr89nmjO747Ug0H0/EC4/ZgaW4UBo+hPqP8p y7v0l/K3ysicB0/B5FzIaYsua8paEmAt31bg0ivZEmYKZYFKjWDtS/zZbZXmjW4ts6+N KxpcJdhxEkFnOstJqLaEFlRgUCI1blsnc8MEbRAwYSUKWgkyyzgfgnVcQfAncRHCZzFD FClYLMR6rLs0I9uvNo1uY2dICRkvJtjEwan3ngqL0BfKcIqYw3/NC2bm0QqPptsT5YYX jKfoltgrCVzwMwnpEg/cJ1+xvjlcgPsiGrEzgTH7QZhkkyVe+qlLM4kooQN1obMJviIQ SDHQ== X-Forwarded-Encrypted: i=1; AJvYcCUJ7L6vt8GxzjtalVQCGJEaWGs6ijkacyIkp96j+gR83JKMmpB4Ni9y6HKEJelb9jfjNSMia/Ahe81Db7c=@vger.kernel.org X-Gm-Message-State: AOJu0YyLW5IVGll8MlVTFk6smD1ahUS24J6wGQ6F3BaHf0kHyqEJFXYS UDoJH0lfvLOSFfrdi/qKjs2CJ8ttGUqaNUKllbL+2bUkqZEs+yeMDfN3w8/Mv2By1wMsw0DHjHi h03K1EZ3aRmLoKPRRGhvrTLiRGwOaByFevntHpDbPsyVekM8qJUhPesbk23m0vFxdFZg= X-Gm-Gg: ASbGnct1fndxLtl/Bnle1oMj35zQu1+FQchcAzSKUA3SNA7caqSwfmkpUtPysTAeKZU r+WKexWEW9x5LASOzT0VugX20OVV6eVmL376PmrCCivJzBuo+mADRCgGQhm8QKzfu6GWooxeo4e FPvApCjlmXBIDDFaVTp+1n6BO9U35nYNKxoKY3F2wWy7FYPCQIyEk92X/HMwM2AyxJaaqn6/U6O o06ESBR6uuQWCK6btsR/bgUzxE9V3Qd3GjEdGmnflQwg1uGLn5diuxy7Mcvp7YlvIUzuMR2k2gC IcG2AME/XWYtCKFJR2OdJA8smUS39vj9d/Mx3uPGh97nirrVsCKw/nLefvEiD5Pq2R9qDmuRTA8 xkrRJO+b95uikeCGQv3fMtxlr4lznWMqHJvaz+eqW38jZzCMbTFkUUUNpHI20vNt36zgSzOegsw == X-Received: by 2002:a17:903:3d0f:b0:272:c95c:866 with SMTP id d9443c01a7336-2962add9ff7mr78614775ad.20.1762399855976; Wed, 05 Nov 2025 19:30:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IF9QTltPz9RRmPwDkcDQIOPYHfaIIJz6Spx26cH1ZGrR/KWzltXDw4loiZpEHpRNl258LBKLw== X-Received: by 2002:a17:903:3d0f:b0:272:c95c:866 with SMTP id d9443c01a7336-2962add9ff7mr78614225ad.20.1762399855352; Wed, 05 Nov 2025 19:30:55 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 19:30:54 -0800 (PST) From: Wangao Wang Date: Thu, 06 Nov 2025 11:30:36 +0800 Subject: [PATCH v4 4/6] 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: <20251106-iris_encoder_enhancements-v4-4-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=14609; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=o9jgvd8ifbR3z9utxRdBFlJf/j37qH4/sIxqwnCFP8g=; b=RNvq9OuSHeE40yWjpKSiPSsrHRX3MJelKRepqEhEPIJoVaJTN0DDZ5fpAY+4XNrEaZ877Vu++ Tm3c4j7jAHaAMAACyokZ0sfzG2MNBkfjrDtIFw2Jt1khX1Ju7tmb4JD X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTA2MDAyNiBTYWx0ZWRfX9GvTrWLFv2/s FZo8jooqcL0bbWa48bQet/gDsfIY+GCaKz4hSpVTB1dtzkhFZ7qrC3EOaXsaslHaoioOHj+HVLD edrgxU4Imk2K5OaseHwFYcrj9kXj9M3KLOAs2lnotZr147KE73N49+RmRoxn6KNHjjisd7+0V7Y 6ytEiqiz8cUh/gyCJ7c1UqAWjFjw0aCbgYXZpwnM8somkrQhJ7ds9bZQIQJ7IKg65c/U8jxQTyy oIiUpqb4iIs2/7ujWQrtQkxt3FteYbRH6ZL2Q/N+RkHM1Ah8AKpfjgKjXbixa3XiA2R4iracbzl eQQj/vB3hsyfL3UxDln3l+C4vrm6jmfPy3H7ivPoS2lAyZGY1czXekYKfCc+rEWZU20Md9nDpcd EqdzrpVHI1VYZwS7nJef2Z65WsGdrQ== X-Authority-Analysis: v=2.4 cv=RLu+3oi+ c=1 sm=1 tr=0 ts=690c1671 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==: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=uG9DUKGECoFWVXl0Dc02:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: vBp0Y_I3cDPxUFtIB8HqfL8cv067A80V X-Proofpoint-GUID: vBp0Y_I3cDPxUFtIB8HqfL8cv067A80V 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 suspectscore=0 spamscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511060026 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 Reviewed-by: Dikshita Agarwal --- 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