From nobody Thu Feb 12 15:47:21 2026 Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11020003.outbound.protection.outlook.com [52.101.154.3]) (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 740B313D8BA; Tue, 11 Jun 2024 07:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.154.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090117; cv=fail; b=XYnHu001QmNrW1rRX7a0hpGWh/vFavQwbTFwhNc46Lc5N3/863969l+toLimlgxV7AoFJ6Q9JyL1SygryZsH/Nziunv7MHbdmsbPbxl0h+JX3NXoMzIMVDg5LPcaAXMc0dXvUwxRhvXsULuULc4Kv/SpT+LdT+WdSDY/BaQ9Bvo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090117; c=relaxed/simple; bh=3ZvN1fiAdPJHTszHXG72sa+MecgHPE4+a/u6mD6C70E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=l+fC0MYkWIGLNBkMo6V/iX6CDrL8+S0bJadullcJgKDEoYHeTbDjg8JC2x7wVFvVECcipoJJ6doA3HiT8zqzC74D+6o9eantiF2CxSmBgF5yIQZw37aQ3NrpKgrnHgA3GvQKEUEpwb0AN7WT492zcRjw+zWi0RcETU+yvClUnl4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=pass smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=HXo9bMJr; arc=fail smtp.client-ip=52.101.154.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="HXo9bMJr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DiAi9HzE2zznYt3qCrw8PrOJBmErkQ2grf2BRD1LVWf3mx3LkBxnFud0Rod5CmOjnYDZdAXxjeC+kxJWzrmc9YSvfYy50f444shhpyHvibY4V24Guo1/ZKbmGPilIKBAUsS60bc4qHiMoLhy/ZGFwQ7S9lGGpgMxhZ2vH6nBw2px/9aFflt7z0PECZPG+qNmVI4JUrkUZw06e9hX6wZ3Mx36lEp42oUITjm4ws5KBxNj+eHl7rk51xw3tnhKoDpr6vfK2oblnUUdiZ2eOoRTFIZCyxhjDELq7F3gGDQJL6/1QQTyvJL/TPSvdJcJQWcE+WyEKvQjBypE6yClpgjWJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=THhEhPuuas6UR2pTquwSWb58Jb08aVXfEQX5oBWjfU4=; b=dT/4vPqXAqmtWkhSm6p6ZKa1TtwlRnG1awveW0lNI0j/LAL2/8c4ojjomXu65gS1CFh1VRIW/e3e5QlmLAV6UV0akFASS87Z1+m32JwAZo60uQpNFmfDUTCKOIOSoh+oO8fgyg8r/ALXW/nwPf3zcyo5qVEjkb+dZWlDCgRB5NjE5jgSAGUClrZ0iRqceFG2ELMwfMP4TUMyPIuhapqc2Axwr9RyILS7DXsIbUtz8oQxtTvE/Nb4PMdIHtB725pOw3Ub19f4HcCD2w0LgD2r4iHuepiak68tFOOCJ0uXk3ohypvU2CrBpwUtJMTtqEHOWtQYKE6QVyMvmXvpRldsIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=THhEhPuuas6UR2pTquwSWb58Jb08aVXfEQX5oBWjfU4=; b=HXo9bMJrq2XE9fkAvqv0JDODn84hK7EaJMOHQzwP9KJ9kNkdjY6tLxLpKo6tnAiUQPI43OBWoPzjTiIbXxIDKBKuQ0PmLZbf1DZuA5mev3YaQAQ8UowCkq0Syi/i9FsC6eBSY//qx4p9MBf3/ECmKmGHdMYOs3u/M5Dqy8DnViY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) by SEWP216MB2956.KORP216.PROD.OUTLOOK.COM (2603:1096:101:295::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Tue, 11 Jun 2024 07:15:10 +0000 Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b]) by SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b%4]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 07:15:10 +0000 From: Jackson Lee To: mchehab@kernel.org, nicolas@ndufresne.ca, sebastian.fricke@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, jackson.lee@chipsnmedia.com, Nicolas Dufresne Subject: [PATCH v5 1/4] media: chips-media: wave5: Support SPS/PPS generation for each IDR Date: Tue, 11 Jun 2024 16:14:58 +0900 Message-Id: <20240611071501.80-2-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611071501.80-1-jackson.lee@chipsnmedia.com> References: <20240611071501.80-1-jackson.lee@chipsnmedia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SE2P216CA0014.KORP216.PROD.OUTLOOK.COM (2603:1096:101:117::11) To SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SE1P216MB1303:EE_|SEWP216MB2956:EE_ X-MS-Office365-Filtering-Correlation-Id: 3417979c-e93d-4211-901f-08dc89e63a99 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015|52116005|38350700005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zhmbQ39T7Z5mfxv06J6hVLZGFuFsKoAmrEWaicFJaxNMh5Akc4Dorbf9A5+g?= =?us-ascii?Q?vJYJKIbJlQeyMWhdzKs8hiY4xdKBaFQI9gWpOHnLOuEeijsBHZ1wjuUGS1ay?= =?us-ascii?Q?tpXBUxDV5UL3I0Rjv7vgMGl5JNsM5bir0m5m7u1UzDToLm54TTYEYcf+ly0k?= =?us-ascii?Q?JWUIEDwDAjlPcZflP/7xUnsnyNXIgdsedWn13zmQtg6dYF/J8IqbryqVWUoV?= =?us-ascii?Q?CzEUKrH+c92SNs8n/TAh/yjLDURLxPrO6R4RwXcxWRj78/Q+G56jRSt3Gh6q?= =?us-ascii?Q?hIcXgq4Rs0/GTA1pIoq+YdWOlS/J2qQg6iW+BdlVooSXBENy6F5yk8n0QhX6?= =?us-ascii?Q?hU8mpvIt11w+7cnbI8XvyhTB7PYcfZ1cMKcWY/AHFVq+i4+WgatK0uRzSwNQ?= =?us-ascii?Q?tugtYRVS/HdAf1CWaahkrs/kdZcw1030TiwnwZNwASgBfygocIPbG7mJhaJ0?= =?us-ascii?Q?3WN8I3MWYchNh57oEeY1WYId24jHGkN+MH9aVFTA87Q3rpOYX2QeYGC8ya81?= =?us-ascii?Q?0Vh2rz1yjAXhnSJRrqpu7a1OEAnW7+FtfN4MDpLYflFzpjCkBkmmNen2i2rZ?= =?us-ascii?Q?rcOO2nyCbvWmWKNjSoGiKcWgn2xeoP8eDn/ETE/WUUHcxCRjgo37mKQ6pRm7?= =?us-ascii?Q?+Ukx8pSCjFxxDOIfK5SwzYxO0tScpHSCnirNR+rwWWhAoFK7K5RNtKy/D6VG?= =?us-ascii?Q?R9EpDx0OuAIVyEpISkHIjklRy+gC+4aauf8GPeBCnPebDZQyPXwjf44dt14W?= =?us-ascii?Q?iRVBjkjV4iPZZVaKrH8ET06bfIBEQpdWjPKE6YUGZiZ9hHsKDbt2H+zpbS1y?= =?us-ascii?Q?RR37TveAzSybbMhgDxJozCsptKnS01fym4LSJAUd5SpEm5hEyAtL4aRPcs5N?= =?us-ascii?Q?uDCJNg724zOBZMmDK+L7L02v4NCU8WD2AThF4OZ+geOyrXBqtrYo9/FfIzuz?= =?us-ascii?Q?z0oOvTxkalmdGjA2GjLgx9+bmGtAuazSqNwJLN5rrBFJRkKEhnlxe9uAeswn?= =?us-ascii?Q?OdNEj3Ph4rTAJKIEnIrEmBkpK126ZPfAB8BnhWWNcFwj0NnzwwGATLcCNzZQ?= =?us-ascii?Q?soYbmOTcdbjZcxyES1bRmAIFpoP9w+nEs1lL1P71BYU83dAl1I4nq/cfrkqX?= =?us-ascii?Q?qyjYShVAgpc2D8xoxrTXaIZmUmniM+LIlSqBu/rPNNkhVdpLMhgfGJO2Ghwm?= =?us-ascii?Q?g0DMKkYigB6nRE3FPOIZZQrq4YIkj8uhs1YPAiZyxA34GRDM20nZNKXv75q9?= =?us-ascii?Q?W7yME7NpfutJvEuzFyntG8f0koRoN+Nq2zUoBOhfxGei5I3KmskZPpFRAF+G?= =?us-ascii?Q?nRkJoaZ3s0ibPqqrdBVNIQGeNFijsiWtm1UOg0OHLLb8VlgGRyOEO0zjJ0Un?= =?us-ascii?Q?/DwwOrY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SE1P216MB1303.KORP216.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015)(52116005)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rtNLRXlxsGTHGbGehV0K5BfOMRyGqIxe3i96wb/uE+3UyAATvdz9FDUwwjJP?= =?us-ascii?Q?ieB8NzYpYo3MOPg/6IrvstedjZF9ia07FdHR8CEdho2mTLfU/3XYtZnRHx/u?= =?us-ascii?Q?vaX4pCHNxlhYAWV/LyUM2wD0+LbMJ4fqfM1mFA9EoIunTyYz5HB3Oe7OOzuX?= =?us-ascii?Q?OpkfRlflp/A31+H2G6XYISML1fLUPnUxkSKGAzmVadTBAcU0cDTT3xSqcjhx?= =?us-ascii?Q?YMLmVU1HQh5hPuKyK8Xgp9wEwzyjlmG8xKW9lRWGRLRn15qdtVU0o2nF5Vym?= =?us-ascii?Q?VCPxCN8V8KtaS+JcxYnDsDPnx5SQT8V6ArwZiAPt7iCUBqblYnDOcXKL2r6n?= =?us-ascii?Q?RRJ6jR6/+FcGjq9Us1VtFhgkV9+bkzy/8RJ5poso9lb3oOy7bOtcUk+mHQsC?= =?us-ascii?Q?ZvbzFXCCyhue6uwMZyFw/Bu0t3kpDKv1/t9f2JzkQVvZ7slXGHfCQGuXPow3?= =?us-ascii?Q?wRCE9RHlPUUCHeDyvDEGF8vyL0UnrRN8bAu+u4NX4YJv4m9rhl9gNCJs4XDO?= =?us-ascii?Q?7mrKDApR1QgwcVeOPlRUA3SVp5ipIGqYBo4qFigt8Sm/jabMwStGHr28JrTN?= =?us-ascii?Q?fI4MCWM2v0wtntHmV+rJpOOINjj3U4fOZ/cEFOM2owhwD0DDUwj8jxX3SY2n?= =?us-ascii?Q?mgatwgS/WrCvoBuZ3uwi1OjpcGqZh6yStWIry1omVSEs/FM41ltnvxDF3F5q?= =?us-ascii?Q?DLLUyIi05NAv4Ak0f/ISJccG95G76im5vXK/LwaRNcxYdfSlHaGOjtXAqpfI?= =?us-ascii?Q?M/wp6AnZ8nB9lo2z2KV3uRguxrLEirRS+G64FQdmujfFD1YMW6hcQy53FQpt?= =?us-ascii?Q?T8Mm2EKhC6EOzG9QmUoPnNpCL4LYCjOfK5bWtyMRdKu+VPiY1lB5HlEgv17u?= =?us-ascii?Q?2H9bACX8yJTUCmFJp5SAe0MWnqglCwT1STN9Qn7ykYg5kgtnQyASpGWTZ8Ax?= =?us-ascii?Q?gJ4f/odCOfUbj2luG+Fn3HVjLh/LbuIjhY0l+/3vBkfMsFwqUuYqhw04TQ8U?= =?us-ascii?Q?E/Ej649yS3SvpU93brhINe4Z5hgtmXG4ldpICMjNiMRTVzSBvopEea0cwKki?= =?us-ascii?Q?WnMgUW4NNW/W0FVFbzURlxg4Rw8PVyEHN4eyJN8cDf5sAq/uUnW0gguQ1EaG?= =?us-ascii?Q?YWKZbYIMiLRiM9cyRJ+65T5a4FIDcVa0+aTvAtS1whTUFWl712wONGXVa91g?= =?us-ascii?Q?e/IWwF7NBBb8HbpbHMu2U+F9BB1Ncly5ztBwyxXX1XPe6Wn7b0k7ZARX1sU0?= =?us-ascii?Q?ZqHysEtoxb1IwsE3CfCAuJXKPjSbU6/rc2g5tlhGmdVA51Mjg9jhY393UNJd?= =?us-ascii?Q?eNm7kmZGOfZ7ngPFPB3iwGCCl9GE/Xhvio3BIhaho+eSlsmuufmmYAXRAhnZ?= =?us-ascii?Q?Y/PQRFDS7snK31VlSfe9O9BTXkYybSooECQLQIDXvZhJ+Kt4JJmhQZ1IfBZz?= =?us-ascii?Q?nWZcXoc1tHiZNYvf3hua6S/Kn3SepJfubD0eEQqAzZydjHJgEEYj5Y8rm3rW?= =?us-ascii?Q?2VfXWdMkFagO3dZJ2pB0AQN8349pyPY9f+KoPhbPboKpfGqH7aZaj58Ai1LA?= =?us-ascii?Q?TBf3r4fUBHMBBhKZKqDcnNoPjU1oliN5d3+0sxr7BjN+MXygL4hbj7KnGQp4?= =?us-ascii?Q?fg=3D=3D?= X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3417979c-e93d-4211-901f-08dc89e63a99 X-MS-Exchange-CrossTenant-AuthSource: SE1P216MB1303.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 07:15:09.9061 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iDMcRKw3WPP9YMDAPNH+acZgcB11k8q5H8j9DNaNR+Uqv1twxFZWwn1/l7iPvLmpceNAZmAaCyb1bdJJdmuwHgZOGbLPuPcLNq+LGOwdGtg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEWP216MB2956 Content-Type: text/plain; charset="utf-8" From: "jackson.lee" Provide a control to toggle (0 =3D off / 1 =3D on), whether the SPS and PPS are generated for every IDR. Signed-off-by: Jackson.lee Signed-off-by: Nas Chung Reviewed-by: Nicolas Dufresne --- .../platform/chips-media/wave5/wave5-hw.c | 19 +++++++++++++++---- .../chips-media/wave5/wave5-vpu-enc.c | 7 +++++++ .../platform/chips-media/wave5/wave5-vpuapi.h | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-hw.c b/drivers/= media/platform/chips-media/wave5/wave5-hw.c index 2d82791f575e..fff6e66b66e4 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-hw.c +++ b/drivers/media/platform/chips-media/wave5/wave5-hw.c @@ -23,6 +23,15 @@ #define FEATURE_AVC_ENCODER BIT(1) #define FEATURE_HEVC_ENCODER BIT(0) =20 +#define ENC_AVC_INTRA_IDR_PARAM_MASK 0x7ff +#define ENC_AVC_INTRA_PERIOD_SHIFT 6 +#define ENC_AVC_IDR_PERIOD_SHIFT 17 +#define ENC_AVC_FORCED_IDR_HEADER_SHIFT 28 + +#define ENC_HEVC_INTRA_QP_SHIFT 3 +#define ENC_HEVC_FORCED_IDR_HEADER_SHIFT 9 +#define ENC_HEVC_INTRA_PERIOD_SHIFT 16 + /* Decoder support fields */ #define FEATURE_AVC_DECODER BIT(3) #define FEATURE_HEVC_DECODER BIT(2) @@ -1601,12 +1610,14 @@ int wave5_vpu_enc_init_seq(struct vpu_instance *ins= t) =20 if (inst->std =3D=3D W_AVC_ENC) vpu_write_reg(inst->dev, W5_CMD_ENC_SEQ_INTRA_PARAM, p_param->intra_qp | - ((p_param->intra_period & 0x7ff) << 6) | - ((p_param->avc_idr_period & 0x7ff) << 17)); + ((p_param->intra_period & ENC_AVC_INTRA_IDR_PARAM_MASK) << ENC_AVC_INT= RA_PERIOD_SHIFT) | + ((p_param->avc_idr_period & ENC_AVC_INTRA_IDR_PARAM_MASK) << ENC_AVC_I= DR_PERIOD_SHIFT) | + (p_param->forced_idr_header_enable << ENC_AVC_FORCED_IDR_HEADER_SHIFT)= ); else if (inst->std =3D=3D W_HEVC_ENC) vpu_write_reg(inst->dev, W5_CMD_ENC_SEQ_INTRA_PARAM, - p_param->decoding_refresh_type | (p_param->intra_qp << 3) | - (p_param->intra_period << 16)); + p_param->decoding_refresh_type | (p_param->intra_qp << ENC_HEVC_I= NTRA_QP_SHIFT) | + (p_param->forced_idr_header_enable << ENC_HEVC_FORCED_IDR_HEADER_= SHIFT) | + (p_param->intra_period << ENC_HEVC_INTRA_PERIOD_SHIFT)); =20 reg_val =3D (p_param->rdo_skip << 2) | (p_param->lambda_scaling_enable << 3) | diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/dri= vers/media/platform/chips-media/wave5/wave5-vpu-enc.c index a45a2f699000..a23908011a39 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -1061,6 +1061,9 @@ static int wave5_vpu_enc_s_ctrl(struct v4l2_ctrl *ctr= l) case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE: inst->enc_param.entropy_coding_mode =3D ctrl->val; break; + case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR: + inst->enc_param.forced_idr_header_enable =3D ctrl->val; + break; case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT: break; default: @@ -1219,6 +1222,7 @@ static void wave5_set_enc_openparam(struct enc_open_p= aram *open_param, else open_param->wave_param.intra_refresh_arg =3D num_ctu_row; } + open_param->wave_param.forced_idr_header_enable =3D input.forced_idr_head= er_enable; } =20 static int initialize_sequence(struct vpu_instance *inst) @@ -1701,6 +1705,9 @@ static int wave5_vpu_open_enc(struct file *filp) 0, 1, 1, 0); v4l2_ctrl_new_std(v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops, V4L2_CID_MIN_BUFFERS_FOR_OUTPUT, 1, 32, 1, 1); + v4l2_ctrl_new_std(v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops, + V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR, + 0, 1, 1, 0); =20 if (v4l2_ctrl_hdl->error) { ret =3D -ENODEV; diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h b/driv= ers/media/platform/chips-media/wave5/wave5-vpuapi.h index edc50450ddb8..554c40b2e002 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.h @@ -566,6 +566,7 @@ struct enc_wave_param { u32 lambda_scaling_enable: 1; /* enable lambda scaling using custom GOP */ u32 transform8x8_enable: 1; /* enable 8x8 intra prediction and 8x8 transf= orm */ u32 mb_level_rc_enable: 1; /* enable MB-level rate control */ + u32 forced_idr_header_enable: 1; /* enable header encoding before IDR fra= me */ }; =20 struct enc_open_param { --=20 2.43.0 From nobody Thu Feb 12 15:47:21 2026 Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11020003.outbound.protection.outlook.com [52.101.154.3]) (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 59EE0172769; Tue, 11 Jun 2024 07:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.154.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090119; cv=fail; b=kY+aEiemjZwcQb5+W7EKq4E5BjXALr2OamRItzjc6rPavDnGCmDXslBNW9NM9MVMJ0cBf7ZBa1rYMhL6jG+L5Uk4kxIDjwxRStOdvomYi91Kvak9XHrADjZQIuY302gGLM1uE6q4ohCGBwy/C0b+s7kpNq2rA27NtSASqrbZyo8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090119; c=relaxed/simple; bh=SZpG2d3bZtrKvpZp/hnz0Kd8gQgGmCkSB+bxHens02g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=pFdFtOPFWSnWvP4UVkJ41vadpRfQ1BzNQaZezAfFNEnclTH1J/ZjX3tf9PXxJPz5Mzmjwod701Ur7K8Xp0Cepq2iYAgheJqs98m0JAMlPeN7WJV/70QJmtNUU/RqGunpsKGT8xRNLnE6NSp/XMjYSIeiMAqgWaNBEKT2dS1BvMk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=pass smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=LvpkPLHI; arc=fail smtp.client-ip=52.101.154.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="LvpkPLHI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=idX19jnf9UegnbzAbYY0uwhniOD0TAmjQp8B72Vec9T5w7HcSgLddihtzZh7/kc7m4om1ozw/9+tkO2Eaj6OX3Y/Qf6ldBZBbLhivff2lPL9X1laujVOWzeCx1Y4w9Ze18VtpmAaCABYlG+1B39MmulYe1yaIS5jXFYWoFrU7gbZ+xa2kDqX+Nxy4Xq1rRJ9ckzpBW7FXpTzW7Z/EHjMn6gxb8fLDwuKl54Y/3vFSGpEcQHHhV7qlNRW6p1IMEzafgU7lU/7khLCU90pCj8Oh1W/0Itc0bvqbUNNu4nLO8XhRguh/Ya1igWM9RG35Zdnk07KQJCcd2IOd8Bz5Ju+mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oNHASlbiyIecsumKo7HJA7vUKBkZ3Rx8Og7fVN4+lNg=; b=Aj3DdW4RX1VCHBi4SpWhygY7liMv7TqSS7bSGgJmhKlRJgjyqMu8/kpcL2kKs8NvJYYdOgc0Kd2nsmpql7M10uo25kLRgRo2jajqPVrPdSRaS6Ebj5q0olbZjmbufZ87HKkWtCZJeCwiaOvPLA5pzF0FlwgSdFtb2OAG0TimKrf+cZ01Ss9meS7rggH/G3wo3Qr//CuzzdMgkE5sZbW9h0IBMUb+6uGQORTE/fWylC6W01IAO8/8Y2YC8DKdsJ8MduX0gMNANHv/alpPKBcqEsUZU3v53h0/DIeoZhTnuM0YOFQgjpfaJ/bsr33Sje479tl3pMKRhirVzkgnTKve4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oNHASlbiyIecsumKo7HJA7vUKBkZ3Rx8Og7fVN4+lNg=; b=LvpkPLHIgoJEDfQcSLx2EJj3qPlIM5Az9BhxGoW4OgNO9ncltGQ+fYm390YIgaj+znGLRCYQX0MmdVAXEq80hFa+a2XXTqJk5/KZMQpARVCzYMQrJ7k82ULIjaJvKCl+PMlxI7cC5oVv4b4SUrHTShxwsbNboZ4ntCPYzSejSeo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) by SEWP216MB2956.KORP216.PROD.OUTLOOK.COM (2603:1096:101:295::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Tue, 11 Jun 2024 07:15:10 +0000 Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b]) by SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b%4]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 07:15:10 +0000 From: Jackson Lee To: mchehab@kernel.org, nicolas@ndufresne.ca, sebastian.fricke@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, jackson.lee@chipsnmedia.com, Nicolas Dufresne Subject: [PATCH v5 2/4] media: chips-media: wave5: Support runtime suspend/resume Date: Tue, 11 Jun 2024 16:14:59 +0900 Message-Id: <20240611071501.80-3-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611071501.80-1-jackson.lee@chipsnmedia.com> References: <20240611071501.80-1-jackson.lee@chipsnmedia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SE2P216CA0014.KORP216.PROD.OUTLOOK.COM (2603:1096:101:117::11) To SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SE1P216MB1303:EE_|SEWP216MB2956:EE_ X-MS-Office365-Filtering-Correlation-Id: b0b4d55c-c32f-4301-8660-08dc89e63abc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015|52116005|38350700005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Y7gExp/uoKRmCmcxQl9kbbY+lHYlT58x7pOS5X3rtHBlvuZ/OQpCBNrv5sSJ?= =?us-ascii?Q?IA78qXKYHeRWHVVT55iFr6mi04RvQIl9YXhO/rQCWY+A7JIniqKG9Sdp1804?= =?us-ascii?Q?M6CBoYHjXE81Bdyhy82uMUvqSL9sE9rga963eBMG+NHFcOIO1Hg/kzO3Nfu5?= =?us-ascii?Q?i3RtgF6bQZ5boVqhdifMldAkfXQNUiQ0Dk4L76CBKuwi1IMsVAQsAjIOAoKN?= =?us-ascii?Q?hBTd42gFO8jUZTekRJOqnKDb6NxQXN9JCAaZrW0rjFaUofrI3bGwl0Z/PvMu?= =?us-ascii?Q?vH6YU0wRTvhljkUXjPrERKBOWmnztl7iYC43ipMdzq8HphMMjaGX6w53Uuac?= =?us-ascii?Q?LgmKhX+Ddn+PqZax9YPzrhRgdma1hPN6TlQSmiKL9hTgSK3GWbz8mRxALWvA?= =?us-ascii?Q?T8uYwB5QSblmlWr+v+zKUH1iX2ojGk3p2jKtyt4SPdEE5PH0yck0Ogx2sUP0?= =?us-ascii?Q?lKyyoLZc/SUphOGhdup66Axzx3x7bSCDbNNGd72e5KjhEJHhibtS9QQXL7AJ?= =?us-ascii?Q?PsVL5ruCabPOwAbLpT1aFi07DNJNv66zRpYNedSLxnDC09t05resWUEqOSWo?= =?us-ascii?Q?p8w70Vg0YKaU7bbP8tOqrC9JmgXZfzEUVMknH+L4T0Rorih7gX0EMxn0dbTt?= =?us-ascii?Q?A5EEcyMeOvipd9mP93Q4EzhHd+wEP6fDOiUmlEO+utqxaE6MAHdaXMKVp7o6?= =?us-ascii?Q?8dW0iXFEpn2ytJRQvPlJkefDMia1x9QDIWauFnXBoljVMozhAjwjTizDGL1S?= =?us-ascii?Q?J/Dx07ka0NJ4IKjxd4imjvtPRv5tavXHAN7ZIhwS33lBxVMwzAqOWFLYHubf?= =?us-ascii?Q?YkJYm4csFhU9Fy9Ht0SbatG2tkPtc5Bei2XsQBZNgEEzbP/xPAfr/wMOO3nD?= =?us-ascii?Q?7xUVddoi5BYDlg5jvTcf7oOYSDZwlRWH/b9g5uRq7s/cCM7FN2dnCIoJwhfJ?= =?us-ascii?Q?hTYElS/RwJwIeTy9OopTPGD7wrHIk+2io6ycYHqKb0FGH9EhaP80zaQ5olgy?= =?us-ascii?Q?K5MhGNqktH4AJGBki5A7SZPAoZkDXjBHx3seiZtLu2byaG9eD06Ek4YE4tql?= =?us-ascii?Q?z+kpv7vAuM4Dw2n+6jjiJ0uXURUqMUrBnUmmmc2cPeVIOTyWjn0nDW6wpN9P?= =?us-ascii?Q?hnzlL84K33aV+gKX0VhKUwmn8V6TY5dFCWcx+Nlh/CGhBO+iCaaAlaTWQYfn?= =?us-ascii?Q?qYalA78HFrKr4TFnf4VbGTxZw1EHi3+hy9tVnG/etq1qqv39lsd70Fyyf4/w?= =?us-ascii?Q?HfTjNL+22t2U1497gXkDvtxPgc0XGbCG7+GcC2NmB79VI8+rkSCKlAL4GXD3?= =?us-ascii?Q?yeAKdfPkbU7P8RHdM1t+pT65nWvNseuPO/rBF3HgKcKvm0szpdLGw9qPkZ0v?= =?us-ascii?Q?aZwonEc=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SE1P216MB1303.KORP216.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015)(52116005)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AXVIhWEJXsWX4G8Sq0VPMHFaUWRcsGaexM6Fo5J/dCly+T2phGIadIoxmPSy?= =?us-ascii?Q?Ze/+JwclYOmN37tOmyHrMF3iM6OQoxKakZpTjKjnd6u+/a8LY4+uj4bNWIu0?= =?us-ascii?Q?Rxk8lgxv7/95Nn9nMwplkkvXdiK456sNQe3fVhGwAj1vGRkk4L3aAhVqVLn2?= =?us-ascii?Q?6jTJcRj9DIPR1Pqpq9DXNzwD1QH4qVJz66BOtam9JaYl9PfSMjNvi+3gaNZ/?= =?us-ascii?Q?6E4bbu3rAuvenZXytPI66B6YYwTmV0nSB2q8ZtlF94XmovtVBkXV0cd1TGtO?= =?us-ascii?Q?B3/jezAi29kjXWAUmmmkPe+8249x/ndOzOaca3lpPeX+7kr+Yh0k4L3Da/f1?= =?us-ascii?Q?p74wqdo1Xmy/4b4grJdIOGUlhijVB440CPgBI7lnfrOMiBUKOO/46K9d+EBI?= =?us-ascii?Q?ZTP8FPrQtGEknF1GdjKFGJleSMWbceTl//l1+Qj9MvFDlsOdQGQIatu+8Aw+?= =?us-ascii?Q?3i2sDXcsDeVzPee6zS/GaT4PMxNtR2Yio/qBip9aU5LZmY+MZcXbivQGwgFf?= =?us-ascii?Q?9UgYKk8a0ZvUZSYJDAr4Ho7FNMBSHBZW+htufg0XM3Ljvqq6fSEoC26ElXYN?= =?us-ascii?Q?KhbdiFVaJsaMhCAfMaqBJBwZX1bIeaMnsegQPe51SSHj10kjgNVMEeeeMZBo?= =?us-ascii?Q?CucW2LGPrMGO6XMWnVlLaT7h8t08u+WSLyIm5d/+P6zpbdGbzBqJls4Sf/XH?= =?us-ascii?Q?amgwdRbvKuLc8TD+EJYVNBHsuIzEBnLwDWg8sNa/qFfCNKhOXy0FvcnRLQ/8?= =?us-ascii?Q?zQAFvlgr+3KCgz6smArQWR0gzxqUeuryzy44lD5VWZABZkdWe6of5sGEVEcX?= =?us-ascii?Q?AqBkkkSBbf1RLXwWQMi1Cy0Suy0RYwUNK9znXeMB8HdlhxAwwFGfz4DyMASH?= =?us-ascii?Q?mVuCdGilIJCd5ADrTr+y/AQ3jGzBhuyf05rw9SUgfUIsP0htOKlmWMEdYWSK?= =?us-ascii?Q?yof+kV4fE7BK2Ncify+o/apIGXxM2Lt8oattCokdQiz5KV/hS1El7z7AtGFj?= =?us-ascii?Q?8WVW9Q2IwFGgm9wgplcuqh6JsqTvLr6IzVR53I5Tw5qc3binbQZkeHFC/dKE?= =?us-ascii?Q?Se6wiUzyHrg1b/Iv6xob+rLHuAitUAkiDy6uN67fujbBiR4Qwn4J6Lomm2fy?= =?us-ascii?Q?YOlfUJIyVXfXQAO+Pd+7aIFO+hVJHvjR8oSL1SAORL1qP8MS386u/T/sjgAb?= =?us-ascii?Q?6l7EOfuv28lH3HbJFgin4HXt6Q866lPxGI1F8oSMrMaz6WBkVomtmaBDuzZb?= =?us-ascii?Q?hxTWphKFRRHB7fakXn/6D/ke2B9Pm9VmQaYUmRfvRo7IE696tpBlDvakfiuk?= =?us-ascii?Q?P+FPa5Z9jQuNyY9TO5+j84p/lBMypBlSFoYI7zqJT+e0bz8p3M09A4P9KsBJ?= =?us-ascii?Q?8hBdEUbVkHfITdDTKeqCeu17W9YXW2d0hIG66ZXvTmRJIluH2Js4JRvI0yAH?= =?us-ascii?Q?ab5DeXCnicscw3iVFmyUdN0GL5p1lxLyYjlCjMZxai6+MoIBN2FPtBpn6fqe?= =?us-ascii?Q?5wlP4pBIXr1sBFwpqpQqn9YRRof0D53z5/JDDAYnpq6aKljuWLhfpOO+TuGP?= =?us-ascii?Q?c+ZLAhuoYe+NsI5wiuS8SgBWAbNb/6fWrhbu/rYV2oNqmTrOe31iy/Id2sq9?= =?us-ascii?Q?RQ=3D=3D?= X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0b4d55c-c32f-4301-8660-08dc89e63abc X-MS-Exchange-CrossTenant-AuthSource: SE1P216MB1303.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 07:15:10.1298 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rSvamMBM2xxhUCYpvGT23+9hoyO6g1NSRbBCOCH+e/Ukis6pJb2xKxwrgvRs5WMxPAwyT+Oika3LaEaEbmg9acWu2AbkiWOAowgR9NXhIgo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEWP216MB2956 Content-Type: text/plain; charset="utf-8" From: "jackson.lee" Add support for runtime suspend/resume in the encoder and decoder. This is achieved by saving the VPU state and powering it off while the VPU idle. Signed-off-by: Jackson.lee Signed-off-by: Nas Chung Reviewed-by: Nicolas Dufresne --- .../platform/chips-media/wave5/wave5-hw.c | 4 +- .../chips-media/wave5/wave5-vpu-dec.c | 16 ++++++- .../chips-media/wave5/wave5-vpu-enc.c | 15 +++++++ .../platform/chips-media/wave5/wave5-vpu.c | 43 +++++++++++++++++++ .../platform/chips-media/wave5/wave5-vpuapi.c | 14 ++++-- .../media/platform/chips-media/wave5/wave5.h | 3 ++ 6 files changed, 88 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-hw.c b/drivers/= media/platform/chips-media/wave5/wave5-hw.c index fff6e66b66e4..791b1f0e3199 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-hw.c +++ b/drivers/media/platform/chips-media/wave5/wave5-hw.c @@ -1084,8 +1084,8 @@ int wave5_vpu_re_init(struct device *dev, u8 *fw, siz= e_t size) return setup_wave5_properties(dev); } =20 -static int wave5_vpu_sleep_wake(struct device *dev, bool i_sleep_wake, con= st uint16_t *code, - size_t size) +int wave5_vpu_sleep_wake(struct device *dev, bool i_sleep_wake, const uint= 16_t *code, + size_t size) { u32 reg_val; struct vpu_buf *common_vb; diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/dri= vers/media/platform/chips-media/wave5/wave5-vpu-dec.c index c8624c681fa6..861a0664047c 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -5,6 +5,7 @@ * Copyright (C) 2021-2023 CHIPS&MEDIA INC */ =20 +#include #include "wave5-helper.h" =20 #define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder" @@ -518,6 +519,8 @@ static void wave5_vpu_dec_finish_decode(struct vpu_inst= ance *inst) if (q_status.report_queue_count =3D=3D 0 && (q_status.instance_queue_count =3D=3D 0 || dec_info.sequence_changed)= ) { dev_dbg(inst->dev->dev, "%s: finishing job.\n", __func__); + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx); } } @@ -1382,6 +1385,7 @@ static int wave5_vpu_dec_start_streaming(struct vb2_q= ueue *q, unsigned int count int ret =3D 0; =20 dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type); + pm_runtime_resume_and_get(inst->dev->dev); =20 v4l2_m2m_update_start_streaming_state(m2m_ctx, q); =20 @@ -1425,13 +1429,15 @@ static int wave5_vpu_dec_start_streaming(struct vb2= _queue *q, unsigned int count } } } - + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); return ret; =20 free_bitstream_vbuf: wave5_vdi_free_dma_memory(inst->dev, &inst->bitstream_vbuf); return_buffers: wave5_return_bufs(q, VB2_BUF_STATE_QUEUED); + pm_runtime_put_autosuspend(inst->dev->dev); return ret; } =20 @@ -1517,6 +1523,7 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_q= ueue *q) bool check_cmd =3D TRUE; =20 dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type); + pm_runtime_resume_and_get(inst->dev->dev); =20 while (check_cmd) { struct queue_status_info q_status; @@ -1540,6 +1547,9 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_q= ueue *q) streamoff_output(q); else streamoff_capture(q); + + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); } =20 static const struct vb2_ops wave5_vpu_dec_vb2_ops =3D { @@ -1626,7 +1636,7 @@ static void wave5_vpu_dec_device_run(void *priv) int ret =3D 0; =20 dev_dbg(inst->dev->dev, "%s: Fill the ring buffer with new bitstream data= ", __func__); - + pm_runtime_resume_and_get(inst->dev->dev); ret =3D fill_ringbuffer(inst); if (ret) { dev_warn(inst->dev->dev, "Filling ring buffer failed\n"); @@ -1709,6 +1719,8 @@ static void wave5_vpu_dec_device_run(void *priv) =20 finish_job_and_return: dev_dbg(inst->dev->dev, "%s: leave and finish job", __func__); + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx); } =20 diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/dri= vers/media/platform/chips-media/wave5/wave5-vpu-enc.c index a23908011a39..703fd8d1c7da 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -5,6 +5,7 @@ * Copyright (C) 2021-2023 CHIPS&MEDIA INC */ =20 +#include #include "wave5-helper.h" =20 #define VPU_ENC_DEV_NAME "C&M Wave5 VPU encoder" @@ -1310,6 +1311,7 @@ static int wave5_vpu_enc_start_streaming(struct vb2_q= ueue *q, unsigned int count struct v4l2_m2m_ctx *m2m_ctx =3D inst->v4l2_fh.m2m_ctx; int ret =3D 0; =20 + pm_runtime_resume_and_get(inst->dev->dev); v4l2_m2m_update_start_streaming_state(m2m_ctx, q); =20 if (inst->state =3D=3D VPU_INST_STATE_NONE && q->type =3D=3D V4L2_BUF_TYP= E_VIDEO_OUTPUT_MPLANE) { @@ -1364,9 +1366,13 @@ static int wave5_vpu_enc_start_streaming(struct vb2_= queue *q, unsigned int count if (ret) goto return_buffers; =20 + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); return 0; return_buffers: wave5_return_bufs(q, VB2_BUF_STATE_QUEUED); + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); return ret; } =20 @@ -1408,6 +1414,7 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_q= ueue *q) */ =20 dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, q->type); + pm_runtime_resume_and_get(inst->dev->dev); =20 if (wave5_vpu_both_queues_are_streaming(inst)) switch_state(inst, VPU_INST_STATE_STOP); @@ -1432,6 +1439,9 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_q= ueue *q) streamoff_output(inst, q); else streamoff_capture(inst, q); + + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); } =20 static const struct vb2_ops wave5_vpu_enc_vb2_ops =3D { @@ -1478,6 +1488,7 @@ static void wave5_vpu_enc_device_run(void *priv) u32 fail_res =3D 0; int ret =3D 0; =20 + pm_runtime_resume_and_get(inst->dev->dev); switch (inst->state) { case VPU_INST_STATE_PIC_RUN: ret =3D start_encode(inst, &fail_res); @@ -1491,6 +1502,8 @@ static void wave5_vpu_enc_device_run(void *priv) break; } dev_dbg(inst->dev->dev, "%s: leave with active job", __func__); + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); return; default: WARN(1, "Execution of a job in state %s is invalid.\n", @@ -1498,6 +1511,8 @@ static void wave5_vpu_enc_device_run(void *priv) break; } dev_dbg(inst->dev->dev, "%s: leave and finish job", __func__); + pm_runtime_mark_last_busy(inst->dev->dev); + pm_runtime_put_autosuspend(inst->dev->dev); v4l2_m2m_job_finish(inst->v4l2_m2m_dev, m2m_ctx); } =20 diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers= /media/platform/chips-media/wave5/wave5-vpu.c index 68a519ac412d..0e7c1c255563 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "wave5-vpu.h" #include "wave5-regdefine.h" #include "wave5-vpuconfig.h" @@ -145,6 +146,38 @@ static int wave5_vpu_load_firmware(struct device *dev,= const char *fw_name, return 0; } =20 +static __maybe_unused int wave5_pm_suspend(struct device *dev) +{ + struct vpu_device *vpu =3D dev_get_drvdata(dev); + + if (pm_runtime_suspended(dev)) + return 0; + + wave5_vpu_sleep_wake(dev, true, NULL, 0); + clk_bulk_disable_unprepare(vpu->num_clks, vpu->clks); + + return 0; +} + +static __maybe_unused int wave5_pm_resume(struct device *dev) +{ + struct vpu_device *vpu =3D dev_get_drvdata(dev); + int ret =3D 0; + + wave5_vpu_sleep_wake(dev, false, NULL, 0); + ret =3D clk_bulk_prepare_enable(vpu->num_clks, vpu->clks); + if (ret) { + dev_err(dev, "Enabling clocks, fail: %d\n", ret); + return ret; + } + + return ret; +} + +static const struct dev_pm_ops wave5_pm_ops =3D { + SET_RUNTIME_PM_OPS(wave5_pm_suspend, wave5_pm_resume, NULL) +}; + static int wave5_vpu_probe(struct platform_device *pdev) { int ret; @@ -268,6 +301,12 @@ static int wave5_vpu_probe(struct platform_device *pde= v) (match_data->flags & WAVE5_IS_DEC) ? "'DECODE'" : ""); dev_info(&pdev->dev, "Product Code: 0x%x\n", dev->product_code); dev_info(&pdev->dev, "Firmware Revision: %u\n", fw_revision); + + pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); + pm_runtime_use_autosuspend(&pdev->dev); + pm_runtime_enable(&pdev->dev); + wave5_vpu_sleep_wake(&pdev->dev, true, NULL, 0); + return 0; =20 err_enc_unreg: @@ -295,6 +334,9 @@ static void wave5_vpu_remove(struct platform_device *pd= ev) hrtimer_cancel(&dev->hrtimer); } =20 + pm_runtime_put_sync(&pdev->dev); + pm_runtime_disable(&pdev->dev); + mutex_destroy(&dev->dev_lock); mutex_destroy(&dev->hw_lock); clk_bulk_disable_unprepare(dev->num_clks, dev->clks); @@ -320,6 +362,7 @@ static struct platform_driver wave5_vpu_driver =3D { .driver =3D { .name =3D VPU_PLATFORM_DEVICE_NAME, .of_match_table =3D of_match_ptr(wave5_dt_ids), + .pm =3D &wave5_pm_ops, }, .probe =3D wave5_vpu_probe, .remove_new =3D wave5_vpu_remove, diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c b/driv= ers/media/platform/chips-media/wave5/wave5-vpuapi.c index 1a3efb638dde..b0911fef232f 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuapi.c @@ -6,6 +6,8 @@ */ =20 #include +#include +#include #include "wave5-vpuapi.h" #include "wave5-regdefine.h" #include "wave5.h" @@ -200,9 +202,13 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32= *fail_res) if (!inst->codec_info) return -EINVAL; =20 + pm_runtime_resume_and_get(inst->dev->dev); + ret =3D mutex_lock_interruptible(&vpu_dev->hw_lock); - if (ret) + if (ret) { + pm_runtime_put_sync(inst->dev->dev); return ret; + } =20 do { ret =3D wave5_vpu_dec_finish_seq(inst, fail_res); @@ -234,7 +240,7 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 = *fail_res) =20 unlock_and_return: mutex_unlock(&vpu_dev->hw_lock); - + pm_runtime_put_sync(inst->dev->dev); return ret; } =20 @@ -702,6 +708,8 @@ int wave5_vpu_enc_close(struct vpu_instance *inst, u32 = *fail_res) if (!inst->codec_info) return -EINVAL; =20 + pm_runtime_resume_and_get(inst->dev->dev); + ret =3D mutex_lock_interruptible(&vpu_dev->hw_lock); if (ret) return ret; @@ -733,9 +741,9 @@ int wave5_vpu_enc_close(struct vpu_instance *inst, u32 = *fail_res) } =20 wave5_vdi_free_dma_memory(vpu_dev, &p_enc_info->vb_task); - mutex_unlock(&vpu_dev->hw_lock); =20 + pm_runtime_put_sync(inst->dev->dev); return 0; } =20 diff --git a/drivers/media/platform/chips-media/wave5/wave5.h b/drivers/med= ia/platform/chips-media/wave5/wave5.h index 063028eccd3b..6125eff938a8 100644 --- a/drivers/media/platform/chips-media/wave5/wave5.h +++ b/drivers/media/platform/chips-media/wave5/wave5.h @@ -56,6 +56,9 @@ int wave5_vpu_get_version(struct vpu_device *vpu_dev, u32= *revision); =20 int wave5_vpu_init(struct device *dev, u8 *fw, size_t size); =20 +int wave5_vpu_sleep_wake(struct device *dev, bool i_sleep_wake, const uint= 16_t *code, + size_t size); + int wave5_vpu_reset(struct device *dev, enum sw_reset_mode reset_mode); =20 int wave5_vpu_build_up_dec_param(struct vpu_instance *inst, struct dec_ope= n_param *param); --=20 2.43.0 From nobody Thu Feb 12 15:47:21 2026 Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11020003.outbound.protection.outlook.com [52.101.154.3]) (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 A7095172BD5; Tue, 11 Jun 2024 07:15:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.154.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090124; cv=fail; b=enyl51fz0Rq9lEh3jkj/bW9+hbkf2sdPDxnt/gQ0HBtVstSY8e9W8Gh1NzaNOR0DymWsBWoR+GFURSz+cs4+NJxQm4eL31m8fXMzstVGzb1XiGfeq/PQNL0z/RJ3NNx+YB1qSZUtaDBJUnZz1EDojuQcqfTbPSu6rO1jF4goznQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090124; c=relaxed/simple; bh=m66wow6D8ksolIHJBfC5trVFgEfm7TlZXlRPzugrWkE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VcU1deS2D2YFqFGBNq6wod3l0YxrLc3bRun6LZlrK6kc2s88sEevei8d6gZ7wu4ka7mWLprv9egZGjaHdT2+swmOBwCebsFb5/+ZKobQ45SRf0Wf7N9GRknZvcgJz/vVQG2hwyLAOTQaVZ71pB023gdFWDxI1BRoPHyjA7nrayQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=pass smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=cNB8LYHM; arc=fail smtp.client-ip=52.101.154.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="cNB8LYHM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YeS8TZySahs0AN4YfPOX1uc0Y1sGb4ytUfP/IGyzaJZVIKuVGMo5I9c+1ZMlGXf1xox3ryCTPu0ie6YKkqJSoCLmiX2PSct1IPQeLNHM9tw0x2+4C4ynw2tFseeoFN1Qh5OEv95i1tchb/3gxJ8hFr7YGE7JkAuFl4XPeZAv6pgQYxRZ5SQQP4qA19X33sW4F/X6AljXYkoU02q0L5Bc9mkZeVRhKQ02hCrnjx30y592KWJ3K2Cs1zVGLZPh0TIUaOVRKMH79/KCnswlkyxn2Lb0QrW183RltZqTtQWenNP9kKMN13jCYqkQXqRqsipyKFZKIArVgVQWb2iWuQHUog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ASyWbkkM9u0HLjNw8t1PkckbREEsvStBzNCj0SkBQ/g=; b=eDo9kPOp68Yi1Wx6ho0Kh2Dgw66DRezihJvhA83Hx7GocF6mjAbHOstkAJ9q0DHdfqsB5GxQGSOqWUTbMs23ApF1hVYJm3Mqj6qCiBZdcCa0lPijDQt0QLDJYbtCKRczz1TuPJnetg0deOr22dw2fa2F1h0LcI+DqRPOONvazcAhtBpZ7t0TSNWoh8s/neO41yXUPf/yqIrsNvgOkHE8my1sC7PL7npIP2w17NWpt17em3oSaAp669IoAPuoZUKFoRWw4KCUSKL0Mex6b3VH572ASO4TWAVhD84CcffUShbG69jOd0iDmJEzPGY+fkMF9sA6iVUwEZtMrtinw7ZH6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ASyWbkkM9u0HLjNw8t1PkckbREEsvStBzNCj0SkBQ/g=; b=cNB8LYHMPp6yPL2NMb45NWINPKCllTzQlfXMyxjGYtmTTxgwpJDROFeQ3ak49V8QupigbFef9Dawf+SzlBca4Nh3pQ9qbkALyV7m8R1Ea8v8Bp0Tigl4xJ8qqDV86GkCcOOWWvKdjeA6rr+3hV9hiTXD0jQiTieobarqviTrSLk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) by SEWP216MB2956.KORP216.PROD.OUTLOOK.COM (2603:1096:101:295::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Tue, 11 Jun 2024 07:15:10 +0000 Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b]) by SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b%4]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 07:15:10 +0000 From: Jackson Lee To: mchehab@kernel.org, nicolas@ndufresne.ca, sebastian.fricke@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, jackson.lee@chipsnmedia.com, Nicolas Dufresne Subject: [PATCH v5 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage. Date: Tue, 11 Jun 2024 16:15:00 +0900 Message-Id: <20240611071501.80-4-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611071501.80-1-jackson.lee@chipsnmedia.com> References: <20240611071501.80-1-jackson.lee@chipsnmedia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SE2P216CA0014.KORP216.PROD.OUTLOOK.COM (2603:1096:101:117::11) To SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SE1P216MB1303:EE_|SEWP216MB2956:EE_ X-MS-Office365-Filtering-Correlation-Id: eb6ee9ba-e1f8-4e04-e9ef-08dc89e63ada X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015|52116005|38350700005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oQ7sNN5FTL8omDWVmQCL3iXEKXPdIZJ+cm/YL6riqUhwEtq5ng5L3DSeBm4F?= =?us-ascii?Q?bh3y8E0OhWd/qb7fM4H5vXwAzwex6953NJEGhi1dPFpCRcDzbIS4hbgCQPiW?= =?us-ascii?Q?0gbe2PmY76wFpIZf6ISmCNuuYA2LL1eHX4O89Qr0TwUk7h+tJ9XvqqBoMJR2?= =?us-ascii?Q?j8NajzzaqerQizfJzVnw1prsCaDX7iJHNNObww7oSgqaOcgchlfF5qJkHV0t?= =?us-ascii?Q?mcLQ0LphWXAb1gN0Ph53pbXG4Lkl1IgvXIgVFxgqa9eYalgRqL64eCn6poqY?= =?us-ascii?Q?qZUtMyrvqz/OXKC+xdkpjrXhwL/D+KkQ+kioiAPLbRca08nWrZzYCNBjVUHf?= =?us-ascii?Q?ZF0DISnXk7oud4O0DhFVLpwONEolejzOSThYb62TIBhZlXqZzLGBgNAex5Ss?= =?us-ascii?Q?A8OaquQYn3uonRL6IXOf83i9vXUAxDKkwKXk1iOKwqYkzrx1pgSIrucOoFrj?= =?us-ascii?Q?yjwoumPiU2GmZ6pidhqOnyyHYoYdYvxgjUBjPd5R3EEMWAEoqiOgDDEwFZag?= =?us-ascii?Q?QhD4aF8D9LfCPpwcvvyZsrMgQ74Zt8stMJTATH1erL1rxA3G/e8QEg5aFrEi?= =?us-ascii?Q?wHo7bo7ofLJYG3ZEpblywlT0qJNHeICiOTKOdYBriPoig0xWqnFtsPa6ZGFd?= =?us-ascii?Q?tLy02A+fiee8PrNkeW30ZwzbRsxXDXK5Js1Q9VdO8P85OghFxuK2wOnWUw9m?= =?us-ascii?Q?KkoRG52s4em+o683PekP+dwcLZSq7ddG1PxkpFggszGcrrVrumPSxk8hf98i?= =?us-ascii?Q?n3vN9LppvA3WJu8AW9xZ2zdmyHY2bkB4/njaU+zZMEcn6+86GWZmU/Jwu6qk?= =?us-ascii?Q?8bo29GVdttprcVPU4PCdNBmBFcC3HicTcer+S4pKLWQ5ATkNA2Zrs1al0Phl?= =?us-ascii?Q?JjFji/EsApwtMJj8BxCMTQ2MxMT6ZyTcENh+zNLn5q/HN09V5Hqu2ubtJ9ju?= =?us-ascii?Q?liuSFzx/phxWsPsbqGKy73MrJRwfL9kjlQjK7hcZ5wRR+I8RpoNlYd7Zp3zb?= =?us-ascii?Q?xKezOaIOaN90cEB5jlzn111+wiqItIWqjAvd5VFmtniKnC/khqbfxbQ6EnZr?= =?us-ascii?Q?r7pOX4qPPRKChr3p4FnRAqnOJHJZ4NfhLh4eTyGGHiDnmcYcKyUoYsndHODd?= =?us-ascii?Q?io74ey2hfynpNlvoOMVd1M5Zu1fuji3gRQ/mTEE7crbBqFKBBQicwC8MAtzc?= =?us-ascii?Q?FtYTw7XELm2xg5YGpxxw7xPeKUDpGF3sbKFxKofMkE037tjwO9NGBM0Kmsq1?= =?us-ascii?Q?dJjn9YqAFpffKPk01pcbtRVJeOOaatJKiZ3ztxTjLlv28fTv6KuqiajRkXEr?= =?us-ascii?Q?3lMRojzce0IwdXDaMCjj62l4nDv81sOcpVz+fpIcVZCfU4OovblrQ3nRAmPC?= =?us-ascii?Q?8NRkgGE=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SE1P216MB1303.KORP216.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015)(52116005)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9fy/zPclFfTGJsyhuo+VOsLaOZQYMeP00HLUkGm+q3u6q593MtNiVYhE9GO5?= =?us-ascii?Q?PtO9gqWU/+vmEugWxLTzCqfVbN8VXjAWWLCnJP5zFTA3d7qx0XUmvi7F+HvK?= =?us-ascii?Q?VkncLTqUyCxVibb/g/WqUkc5xpvOa16phfKWTI+qGp34FCQofe3OQJrJF6PA?= =?us-ascii?Q?rQ8RPSeEbqf894mABVfoT09HkxP++FPgEeKWnJNZhP/UPNhJo0WvLXAIyBlP?= =?us-ascii?Q?dXEQ8XG1v9pvz1iFgvFaJxSbYf7eQd462Ydm6ZYwBc+6Dz3RLIBzJaPpmRuG?= =?us-ascii?Q?jjZ2XLs+j1pqH6ieqLsH24ukCQKiCfQ+2Vc1pXqdtYrGAnhnPPZbJoSCo9w2?= =?us-ascii?Q?XBkE17al9rvZ1LsqmvQqcLWBf2n2OfOw3zAmhSNiHNK7DPgIHFfsyGEls1lt?= =?us-ascii?Q?62wp0RnIINmVX2tvIHqiWvAipiyEeLz238eg7ewaIPDwTNYlBgVu4PswJxyI?= =?us-ascii?Q?DWJmaecNE+aoSTpvaxjeJEjHczejau6vgyH2ynRKXuxxE9epENv/GVjjbJfS?= =?us-ascii?Q?VvRJzYyvTiYvshpHL6tvXHGLS1mNsm9pukrszOHaDmuA2Vu4WmkOBUlr0Wcb?= =?us-ascii?Q?OD2xxgM10usNoHiuGgqHHigRrLVSj0ZpHnTzZtZfhJagC14wyCExGSMdQlGf?= =?us-ascii?Q?WCqC39g6ixF/cZZ+O1ZXJ3kDTXDO+LjQ8pf9xm3iDpF7k1d/JLrv/d2MSTDY?= =?us-ascii?Q?TnruBh7LjL/YvERU8nsotACgHnfAYarGcShfFdwBq84R0jdNrnSDjbK9Hku3?= =?us-ascii?Q?JL3Y9hgPJX3HZ8TMYlxJ2PQ2dVUNvSMOH0aO46TAUqz8i0AwM6QXZ0H70iut?= =?us-ascii?Q?Zts/wcjm09Q5FL3HcLT7t2F63KB15SMtFc2k5vqy4Xt98MrJxrT1Tzn45m1P?= =?us-ascii?Q?DrWxWr4/I0sbdoRDAxiquAPdWzanJxcITpzRib/RdvjvSbW9YulKTGlXsKE6?= =?us-ascii?Q?pe4GXSDrkkrcjliMee/BWvN0UNxhfqRE8UQoF2coy6SESKvfxp4BNZDyqUdC?= =?us-ascii?Q?7buoHs/tegGuIMpCNaaHlsk645fOU1xiyhXER5XINx/mMSjRnykhEURlMFZC?= =?us-ascii?Q?a6rdpjacqMIqOr0ikJC98apUT5F+hDe7YltXd/4VTjLk/K5PcyQVCGLuNP4B?= =?us-ascii?Q?OVgHdgbS0BQTyz9EWsJnoJvRSCvngAGWnfzwnJ6T7j6D767w6bDWHjPm44oI?= =?us-ascii?Q?XdFkzcnbGusZi1QVtP6soqJ7/5bfLVHILPW0Zi75bHMyKt/hRXRY1eEeAEYb?= =?us-ascii?Q?m5whQehDZ30uLtLzfimUIG05vNY9h8taIeMSqVdWBrMFdHeG3VejiuRdRsOr?= =?us-ascii?Q?sGCNzXv+o4axAzXtt24ExLBpB7lxuPeIiQtXQHSpcOMu/KV9OQ+c8ADqsKDK?= =?us-ascii?Q?SO5RW+bCnJFJbxjrfOvoFZtuV/CT/b+72jsPAj/YlzSaiZ7Iy+fl+qndxFPO?= =?us-ascii?Q?pKOC8QQXhdzGfpvdL6lzG/KWlmK1UMkvLhg29uJhoN72cmPdSPIQHkDq6Slg?= =?us-ascii?Q?86iROHKhcaTA4OH4W3UHMZ3wvcnGt57nPsf63WXHwkVI7Y70A7WTjCO0RyYz?= =?us-ascii?Q?2kAGLKshTzS4haf9eROXkOGd3G25Zw3D9LfW214QFxJYn7L0DOVC3mRh65nc?= =?us-ascii?Q?aA=3D=3D?= X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb6ee9ba-e1f8-4e04-e9ef-08dc89e63ada X-MS-Exchange-CrossTenant-AuthSource: SE1P216MB1303.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 07:15:10.3632 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KMqbtq8MLHziS4skqG4SMOqIkRRjnN+FSw6YzEw0OFf4/OC17mx3PH/KlCZ3LPSSSY1DcS7lsP5FCXcgrMCrwEEQfhtHYOoqEPXJUA9pUDE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEWP216MB2956 Content-Type: text/plain; charset="utf-8" From: "jackson.lee" Use v4l2-common helper functions to calculate bytesperline and sizeimage, instead of calculating in a wave5 driver directly. In case of raw(YUV) v4l2_pix_format, the wave5 driver updates v4l2_pix_format_mplane struct through v4l2_fill_pixfmt_mp() function. Encoder and Decoder need same bytesperline and sizeimage values for same v4l2_pix_format. So, a wave5_update_pix_fmt is refactored to support both together. Signed-off-by: Jackson.lee Signed-off-by: Nas Chung Reviewed-by: Nicolas Dufresne --- .../platform/chips-media/wave5/wave5-helper.c | 24 ++ .../platform/chips-media/wave5/wave5-helper.h | 5 + .../chips-media/wave5/wave5-vpu-dec.c | 296 ++++++------------ .../chips-media/wave5/wave5-vpu-enc.c | 197 +++++------- .../platform/chips-media/wave5/wave5-vpu.h | 5 +- .../chips-media/wave5/wave5-vpuconfig.h | 27 +- 6 files changed, 235 insertions(+), 319 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-helper.c b/driv= ers/media/platform/chips-media/wave5/wave5-helper.c index 7e0f34bfa5be..b20ab69cd341 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-helper.c +++ b/drivers/media/platform/chips-media/wave5/wave5-helper.c @@ -7,6 +7,8 @@ =20 #include "wave5-helper.h" =20 +#define DEFAULT_BS_SIZE(width, height) ((width) * (height) / 8 * 3) + const char *state_to_str(enum vpu_instance_state state) { switch (state) { @@ -224,3 +226,25 @@ void wave5_return_bufs(struct vb2_queue *q, u32 state) v4l2_m2m_buf_done(vbuf, state); } } + +void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, + int pix_fmt_type, + unsigned int width, + unsigned int height, + const struct v4l2_frmsize_stepwise *frmsize) +{ + v4l2_apply_frmsize_constraints(&width, &height, frmsize); + + if (pix_fmt_type =3D=3D VPU_FMT_TYPE_CODEC) { + pix_mp->width =3D width; + pix_mp->height =3D height; + pix_mp->num_planes =3D 1; + pix_mp->plane_fmt[0].bytesperline =3D 0; + pix_mp->plane_fmt[0].sizeimage =3D max(DEFAULT_BS_SIZE(width, height), + pix_mp->plane_fmt[0].sizeimage); + } else { + v4l2_fill_pixfmt_mp(pix_mp, pix_mp->pixelformat, width, height); + } + pix_mp->flags =3D 0; + pix_mp->field =3D V4L2_FIELD_NONE; +} diff --git a/drivers/media/platform/chips-media/wave5/wave5-helper.h b/driv= ers/media/platform/chips-media/wave5/wave5-helper.h index 6cee1c14d3ce..9937fce553fc 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-helper.h +++ b/drivers/media/platform/chips-media/wave5/wave5-helper.h @@ -28,4 +28,9 @@ const struct vpu_format *wave5_find_vpu_fmt_by_idx(unsign= ed int idx, const struct vpu_format fmt_list[MAX_FMTS]); enum wave_std wave5_to_vpu_std(unsigned int v4l2_pix_fmt, enum vpu_instanc= e_type type); void wave5_return_bufs(struct vb2_queue *q, u32 state); +void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, + int pix_fmt_type, + unsigned int width, + unsigned int height, + const struct v4l2_frmsize_stepwise *frmsize); #endif diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/dri= vers/media/platform/chips-media/wave5/wave5-vpu-dec.c index 861a0664047c..f246c290ad6a 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -11,111 +11,92 @@ #define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder" #define VPU_DEC_DRV_NAME "wave5-dec" =20 -#define DEFAULT_SRC_SIZE(width, height) ({ \ - (width) * (height) / 8 * 3; \ -}) +static const struct v4l2_frmsize_stepwise dec_hevc_frmsize =3D { + .min_width =3D W5_MIN_DEC_PIC_8_WIDTH, + .max_width =3D W5_MAX_DEC_PIC_WIDTH, + .step_width =3D W5_DEC_CODEC_STEP_WIDTH, + .min_height =3D W5_MIN_DEC_PIC_8_HEIGHT, + .max_height =3D W5_MAX_DEC_PIC_HEIGHT, + .step_height =3D W5_DEC_CODEC_STEP_HEIGHT, +}; + +static const struct v4l2_frmsize_stepwise dec_h264_frmsize =3D { + .min_width =3D W5_MIN_DEC_PIC_32_WIDTH, + .max_width =3D W5_MAX_DEC_PIC_WIDTH, + .step_width =3D W5_DEC_CODEC_STEP_WIDTH, + .min_height =3D W5_MIN_DEC_PIC_32_HEIGHT, + .max_height =3D W5_MAX_DEC_PIC_HEIGHT, + .step_height =3D W5_DEC_CODEC_STEP_HEIGHT, +}; + +static const struct v4l2_frmsize_stepwise dec_raw_frmsize =3D { + .min_width =3D W5_MIN_DEC_PIC_8_WIDTH, + .max_width =3D W5_MAX_DEC_PIC_WIDTH, + .step_width =3D W5_DEC_RAW_STEP_WIDTH, + .min_height =3D W5_MIN_DEC_PIC_8_HEIGHT, + .max_height =3D W5_MAX_DEC_PIC_HEIGHT, + .step_height =3D W5_DEC_RAW_STEP_HEIGHT, +}; =20 static const struct vpu_format dec_fmt_list[FMT_TYPES][MAX_FMTS] =3D { [VPU_FMT_TYPE_CODEC] =3D { { .v4l2_pix_fmt =3D V4L2_PIX_FMT_HEVC, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_hevc_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_H264, - .max_width =3D 8192, - .min_width =3D 32, - .max_height =3D 4320, - .min_height =3D 32, + .v4l2_frmsize =3D &dec_h264_frmsize, }, }, [VPU_FMT_TYPE_RAW] =3D { { .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV420, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV12, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV21, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV422P, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV16, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV61, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV420M, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV12M, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV21M, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV422M, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV16M, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV61M, - .max_width =3D 8192, - .min_width =3D 8, - .max_height =3D 4320, - .min_height =3D 8, + .v4l2_frmsize =3D &dec_raw_frmsize, }, } }; @@ -234,74 +215,6 @@ static void wave5_handle_src_buffer(struct vpu_instanc= e *inst, dma_addr_t rd_ptr inst->remaining_consumed_bytes =3D consumed_bytes; } =20 -static void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, un= signed int width, - unsigned int height) -{ - switch (pix_mp->pixelformat) { - case V4L2_PIX_FMT_YUV420: - case V4L2_PIX_FMT_NV12: - case V4L2_PIX_FMT_NV21: - pix_mp->width =3D round_up(width, 32); - pix_mp->height =3D round_up(height, 16); - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D width * height * 3 / 2; - break; - case V4L2_PIX_FMT_YUV422P: - case V4L2_PIX_FMT_NV16: - case V4L2_PIX_FMT_NV61: - pix_mp->width =3D round_up(width, 32); - pix_mp->height =3D round_up(height, 16); - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D width * height * 2; - break; - case V4L2_PIX_FMT_YUV420M: - pix_mp->width =3D round_up(width, 32); - pix_mp->height =3D round_up(height, 16); - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D width * height; - pix_mp->plane_fmt[1].bytesperline =3D round_up(width, 32) / 2; - pix_mp->plane_fmt[1].sizeimage =3D width * height / 4; - pix_mp->plane_fmt[2].bytesperline =3D round_up(width, 32) / 2; - pix_mp->plane_fmt[2].sizeimage =3D width * height / 4; - break; - case V4L2_PIX_FMT_NV12M: - case V4L2_PIX_FMT_NV21M: - pix_mp->width =3D round_up(width, 32); - pix_mp->height =3D round_up(height, 16); - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D width * height; - pix_mp->plane_fmt[1].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[1].sizeimage =3D width * height / 2; - break; - case V4L2_PIX_FMT_YUV422M: - pix_mp->width =3D round_up(width, 32); - pix_mp->height =3D round_up(height, 16); - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D width * height; - pix_mp->plane_fmt[1].bytesperline =3D round_up(width, 32) / 2; - pix_mp->plane_fmt[1].sizeimage =3D width * height / 2; - pix_mp->plane_fmt[2].bytesperline =3D round_up(width, 32) / 2; - pix_mp->plane_fmt[2].sizeimage =3D width * height / 2; - break; - case V4L2_PIX_FMT_NV16M: - case V4L2_PIX_FMT_NV61M: - pix_mp->width =3D round_up(width, 32); - pix_mp->height =3D round_up(height, 16); - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D width * height; - pix_mp->plane_fmt[1].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[1].sizeimage =3D width * height; - break; - default: - pix_mp->width =3D width; - pix_mp->height =3D height; - pix_mp->plane_fmt[0].bytesperline =3D 0; - pix_mp->plane_fmt[0].sizeimage =3D max(DEFAULT_SRC_SIZE(width, height), - pix_mp->plane_fmt[0].sizeimage); - break; - } -} - static int start_decode(struct vpu_instance *inst, u32 *fail_res) { struct v4l2_m2m_ctx *m2m_ctx =3D inst->v4l2_fh.m2m_ctx; @@ -389,6 +302,8 @@ static int handle_dynamic_resolution_change(struct vpu_= instance *inst) } =20 if (p_dec_info->initial_info_obtained) { + const struct vpu_format *vpu_fmt; + inst->conf_win.left =3D initial_info->pic_crop_rect.left; inst->conf_win.top =3D initial_info->pic_crop_rect.top; inst->conf_win.width =3D initial_info->pic_width - @@ -396,10 +311,27 @@ static int handle_dynamic_resolution_change(struct vp= u_instance *inst) inst->conf_win.height =3D initial_info->pic_height - initial_info->pic_crop_rect.top - initial_info->pic_crop_rect.bottom; =20 - wave5_update_pix_fmt(&inst->src_fmt, initial_info->pic_width, - initial_info->pic_height); - wave5_update_pix_fmt(&inst->dst_fmt, initial_info->pic_width, - initial_info->pic_height); + vpu_fmt =3D wave5_find_vpu_fmt(inst->src_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_CODEC]); + if (!vpu_fmt) + return -EINVAL; + + wave5_update_pix_fmt(&inst->src_fmt, + VPU_FMT_TYPE_CODEC, + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); + + vpu_fmt =3D wave5_find_vpu_fmt(inst->dst_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_RAW]); + if (!vpu_fmt) + return -EINVAL; + + wave5_update_pix_fmt(&inst->dst_fmt, + VPU_FMT_TYPE_RAW, + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); } =20 v4l2_event_queue_fh(fh, &vpu_event_src_ch); @@ -545,15 +477,11 @@ static int wave5_vpu_dec_enum_framesizes(struct file = *f, void *fh, struct v4l2_f vpu_fmt =3D wave5_find_vpu_fmt(fsize->pixel_format, dec_fmt_list[VPU_FMT= _TYPE_RAW]); if (!vpu_fmt) return -EINVAL; + return -ENOTTY; } =20 fsize->type =3D V4L2_FRMSIZE_TYPE_CONTINUOUS; - fsize->stepwise.min_width =3D vpu_fmt->min_width; - fsize->stepwise.max_width =3D vpu_fmt->max_width; - fsize->stepwise.step_width =3D 1; - fsize->stepwise.min_height =3D vpu_fmt->min_height; - fsize->stepwise.max_height =3D vpu_fmt->max_height; - fsize->stepwise.step_height =3D 1; + fsize->stepwise =3D *vpu_fmt->v4l2_frmsize; =20 return 0; } @@ -576,6 +504,7 @@ static int wave5_vpu_dec_try_fmt_cap(struct file *file,= void *fh, struct v4l2_fo { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); struct dec_info *p_dec_info =3D &inst->codec_info->dec_info; + const struct v4l2_frmsize_stepwise *frmsize; const struct vpu_format *vpu_fmt; int width, height; =20 @@ -589,14 +518,12 @@ static int wave5_vpu_dec_try_fmt_cap(struct file *fil= e, void *fh, struct v4l2_fo width =3D inst->dst_fmt.width; height =3D inst->dst_fmt.height; f->fmt.pix_mp.pixelformat =3D inst->dst_fmt.pixelformat; - f->fmt.pix_mp.num_planes =3D inst->dst_fmt.num_planes; + frmsize =3D &dec_raw_frmsize; } else { - const struct v4l2_format_info *info =3D v4l2_format_info(vpu_fmt->v4l2_p= ix_fmt); - - width =3D clamp(f->fmt.pix_mp.width, vpu_fmt->min_width, vpu_fmt->max_wi= dth); - height =3D clamp(f->fmt.pix_mp.height, vpu_fmt->min_height, vpu_fmt->max= _height); + width =3D f->fmt.pix_mp.width; + height =3D f->fmt.pix_mp.height; f->fmt.pix_mp.pixelformat =3D vpu_fmt->v4l2_pix_fmt; - f->fmt.pix_mp.num_planes =3D info->mem_planes; + frmsize =3D vpu_fmt->v4l2_frmsize; } =20 if (p_dec_info->initial_info_obtained) { @@ -604,9 +531,8 @@ static int wave5_vpu_dec_try_fmt_cap(struct file *file,= void *fh, struct v4l2_fo height =3D inst->dst_fmt.height; } =20 - wave5_update_pix_fmt(&f->fmt.pix_mp, width, height); - f->fmt.pix_mp.flags =3D 0; - f->fmt.pix_mp.field =3D V4L2_FIELD_NONE; + wave5_update_pix_fmt(&f->fmt.pix_mp, VPU_FMT_TYPE_RAW, + width, height, frmsize); f->fmt.pix_mp.colorspace =3D inst->colorspace; f->fmt.pix_mp.ycbcr_enc =3D inst->ycbcr_enc; f->fmt.pix_mp.quantization =3D inst->quantization; @@ -718,7 +644,9 @@ static int wave5_vpu_dec_enum_fmt_out(struct file *file= , void *fh, struct v4l2_f static int wave5_vpu_dec_try_fmt_out(struct file *file, void *fh, struct v= 4l2_format *f) { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); + const struct v4l2_frmsize_stepwise *frmsize; const struct vpu_format *vpu_fmt; + int width, height; =20 dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: %u colorspace: %u field= : %u\n", @@ -727,20 +655,19 @@ static int wave5_vpu_dec_try_fmt_out(struct file *fil= e, void *fh, struct v4l2_fo =20 vpu_fmt =3D wave5_find_vpu_fmt(f->fmt.pix_mp.pixelformat, dec_fmt_list[VP= U_FMT_TYPE_CODEC]); if (!vpu_fmt) { + width =3D inst->src_fmt.width; + height =3D inst->src_fmt.height; f->fmt.pix_mp.pixelformat =3D inst->src_fmt.pixelformat; - f->fmt.pix_mp.num_planes =3D inst->src_fmt.num_planes; - wave5_update_pix_fmt(&f->fmt.pix_mp, inst->src_fmt.width, inst->src_fmt.= height); + frmsize =3D &dec_hevc_frmsize; } else { - int width =3D clamp(f->fmt.pix_mp.width, vpu_fmt->min_width, vpu_fmt->ma= x_width); - int height =3D clamp(f->fmt.pix_mp.height, vpu_fmt->min_height, vpu_fmt-= >max_height); - + width =3D f->fmt.pix_mp.width; + height =3D f->fmt.pix_mp.height; f->fmt.pix_mp.pixelformat =3D vpu_fmt->v4l2_pix_fmt; - f->fmt.pix_mp.num_planes =3D 1; - wave5_update_pix_fmt(&f->fmt.pix_mp, width, height); + frmsize =3D vpu_fmt->v4l2_frmsize; } =20 - f->fmt.pix_mp.flags =3D 0; - f->fmt.pix_mp.field =3D V4L2_FIELD_NONE; + wave5_update_pix_fmt(&f->fmt.pix_mp, VPU_FMT_TYPE_CODEC, + width, height, frmsize); =20 return 0; } @@ -748,6 +675,7 @@ static int wave5_vpu_dec_try_fmt_out(struct file *file,= void *fh, struct v4l2_fo static int wave5_vpu_dec_s_fmt_out(struct file *file, void *fh, struct v4l= 2_format *f) { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); + const struct vpu_format *vpu_fmt; int i, ret; =20 dev_dbg(inst->dev->dev, @@ -782,7 +710,13 @@ static int wave5_vpu_dec_s_fmt_out(struct file *file, = void *fh, struct v4l2_form inst->quantization =3D f->fmt.pix_mp.quantization; inst->xfer_func =3D f->fmt.pix_mp.xfer_func; =20 - wave5_update_pix_fmt(&inst->dst_fmt, f->fmt.pix_mp.width, f->fmt.pix_mp.h= eight); + vpu_fmt =3D wave5_find_vpu_fmt(inst->dst_fmt.pixelformat, dec_fmt_list[VP= U_FMT_TYPE_RAW]); + if (!vpu_fmt) + return -EINVAL; + + wave5_update_pix_fmt(&inst->dst_fmt, VPU_FMT_TYPE_RAW, + f->fmt.pix_mp.width, f->fmt.pix_mp.height, + vpu_fmt->v4l2_frmsize); =20 return 0; } @@ -1005,6 +939,7 @@ static int wave5_vpu_dec_queue_setup(struct vb2_queue = *q, unsigned int *num_buff struct vpu_instance *inst =3D vb2_get_drv_priv(q); struct v4l2_pix_format_mplane inst_format =3D (q->type =3D=3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) ? inst->src_fmt : ins= t->dst_fmt; + unsigned int i; =20 dev_dbg(inst->dev->dev, "%s: num_buffers: %u | num_planes: %u | type: %u\= n", __func__, *num_buffers, *num_planes, q->type); @@ -1018,31 +953,9 @@ static int wave5_vpu_dec_queue_setup(struct vb2_queue= *q, unsigned int *num_buff if (*num_buffers < inst->fbc_buf_count) *num_buffers =3D inst->fbc_buf_count; =20 - if (*num_planes =3D=3D 1) { - if (inst->output_format =3D=3D FORMAT_422) - sizes[0] =3D inst_format.width * inst_format.height * 2; - else - sizes[0] =3D inst_format.width * inst_format.height * 3 / 2; - dev_dbg(inst->dev->dev, "%s: size[0]: %u\n", __func__, sizes[0]); - } else if (*num_planes =3D=3D 2) { - sizes[0] =3D inst_format.width * inst_format.height; - if (inst->output_format =3D=3D FORMAT_422) - sizes[1] =3D inst_format.width * inst_format.height; - else - sizes[1] =3D inst_format.width * inst_format.height / 2; - dev_dbg(inst->dev->dev, "%s: size[0]: %u | size[1]: %u\n", - __func__, sizes[0], sizes[1]); - } else if (*num_planes =3D=3D 3) { - sizes[0] =3D inst_format.width * inst_format.height; - if (inst->output_format =3D=3D FORMAT_422) { - sizes[1] =3D inst_format.width * inst_format.height / 2; - sizes[2] =3D inst_format.width * inst_format.height / 2; - } else { - sizes[1] =3D inst_format.width * inst_format.height / 4; - sizes[2] =3D inst_format.width * inst_format.height / 4; - } - dev_dbg(inst->dev->dev, "%s: size[0]: %u | size[1]: %u | size[2]: %u\n", - __func__, sizes[0], sizes[1], sizes[2]); + for (i =3D 0; i < *num_planes; i++) { + sizes[i] =3D inst_format.plane_fmt[i].sizeimage; + dev_dbg(inst->dev->dev, "%s: size[%u]: %u\n", __func__, i, sizes[i]); } } =20 @@ -1564,20 +1477,15 @@ static const struct vb2_ops wave5_vpu_dec_vb2_ops = =3D { static void wave5_set_default_format(struct v4l2_pix_format_mplane *src_fm= t, struct v4l2_pix_format_mplane *dst_fmt) { - unsigned int dst_pix_fmt =3D dec_fmt_list[VPU_FMT_TYPE_RAW][0].v4l2_pix_f= mt; - const struct v4l2_format_info *dst_fmt_info =3D v4l2_format_info(dst_pix_= fmt); - src_fmt->pixelformat =3D dec_fmt_list[VPU_FMT_TYPE_CODEC][0].v4l2_pix_fmt; - src_fmt->field =3D V4L2_FIELD_NONE; - src_fmt->flags =3D 0; - src_fmt->num_planes =3D 1; - wave5_update_pix_fmt(src_fmt, 720, 480); - - dst_fmt->pixelformat =3D dst_pix_fmt; - dst_fmt->field =3D V4L2_FIELD_NONE; - dst_fmt->flags =3D 0; - dst_fmt->num_planes =3D dst_fmt_info->mem_planes; - wave5_update_pix_fmt(dst_fmt, 736, 480); + wave5_update_pix_fmt(src_fmt, VPU_FMT_TYPE_CODEC, + W5_DEF_DEC_PIC_WIDTH, W5_DEF_DEC_PIC_HEIGHT, + &dec_hevc_frmsize); + + dst_fmt->pixelformat =3D dec_fmt_list[VPU_FMT_TYPE_RAW][0].v4l2_pix_fmt; + wave5_update_pix_fmt(dst_fmt, VPU_FMT_TYPE_RAW, + W5_DEF_DEC_PIC_WIDTH, W5_DEF_DEC_PIC_HEIGHT, + &dec_raw_frmsize); } =20 static int wave5_vpu_dec_queue_init(void *priv, struct vb2_queue *src_vq, = struct vb2_queue *dst_vq) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/dri= vers/media/platform/chips-media/wave5/wave5-vpu-enc.c index 703fd8d1c7da..a470f24cbabe 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -11,65 +11,60 @@ #define VPU_ENC_DEV_NAME "C&M Wave5 VPU encoder" #define VPU_ENC_DRV_NAME "wave5-enc" =20 +static const struct v4l2_frmsize_stepwise enc_frmsize[FMT_TYPES] =3D { + [VPU_FMT_TYPE_CODEC] =3D { + .min_width =3D W5_MIN_ENC_PIC_WIDTH, + .max_width =3D W5_MAX_ENC_PIC_WIDTH, + .step_width =3D W5_ENC_CODEC_STEP_WIDTH, + .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .max_height =3D W5_MAX_ENC_PIC_HEIGHT, + .step_height =3D W5_ENC_CODEC_STEP_HEIGHT, + }, + [VPU_FMT_TYPE_RAW] =3D { + .min_width =3D W5_MIN_ENC_PIC_WIDTH, + .max_width =3D W5_MAX_ENC_PIC_WIDTH, + .step_width =3D W5_ENC_RAW_STEP_WIDTH, + .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .max_height =3D W5_MAX_ENC_PIC_HEIGHT, + .step_height =3D W5_ENC_RAW_STEP_HEIGHT, + }, +}; + static const struct vpu_format enc_fmt_list[FMT_TYPES][MAX_FMTS] =3D { [VPU_FMT_TYPE_CODEC] =3D { { .v4l2_pix_fmt =3D V4L2_PIX_FMT_HEVC, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_CODEC], }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_H264, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_CODEC], }, }, [VPU_FMT_TYPE_RAW] =3D { { .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV420, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV12, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV21, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV420M, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV12M, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV21M, - .max_width =3D W5_MAX_ENC_PIC_WIDTH, - .min_width =3D W5_MIN_ENC_PIC_WIDTH, - .max_height =3D W5_MAX_ENC_PIC_HEIGHT, - .min_height =3D W5_MIN_ENC_PIC_HEIGHT, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, } }; @@ -106,46 +101,6 @@ static int switch_state(struct vpu_instance *inst, enu= m vpu_instance_state state return -EINVAL; } =20 -static void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, un= signed int width, - unsigned int height) -{ - switch (pix_mp->pixelformat) { - case V4L2_PIX_FMT_YUV420: - case V4L2_PIX_FMT_NV12: - case V4L2_PIX_FMT_NV21: - pix_mp->width =3D width; - pix_mp->height =3D height; - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D round_up(width, 32) * height * 3 / 2; - break; - case V4L2_PIX_FMT_YUV420M: - pix_mp->width =3D width; - pix_mp->height =3D height; - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D round_up(width, 32) * height; - pix_mp->plane_fmt[1].bytesperline =3D round_up(width, 32) / 2; - pix_mp->plane_fmt[1].sizeimage =3D round_up(width, 32) * height / 4; - pix_mp->plane_fmt[2].bytesperline =3D round_up(width, 32) / 2; - pix_mp->plane_fmt[2].sizeimage =3D round_up(width, 32) * height / 4; - break; - case V4L2_PIX_FMT_NV12M: - case V4L2_PIX_FMT_NV21M: - pix_mp->width =3D width; - pix_mp->height =3D height; - pix_mp->plane_fmt[0].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[0].sizeimage =3D round_up(width, 32) * height; - pix_mp->plane_fmt[1].bytesperline =3D round_up(width, 32); - pix_mp->plane_fmt[1].sizeimage =3D round_up(width, 32) * height / 2; - break; - default: - pix_mp->width =3D width; - pix_mp->height =3D height; - pix_mp->plane_fmt[0].bytesperline =3D 0; - pix_mp->plane_fmt[0].sizeimage =3D width * height / 8 * 3; - break; - } -} - static int start_encode(struct vpu_instance *inst, u32 *fail_res) { struct v4l2_m2m_ctx *m2m_ctx =3D inst->v4l2_fh.m2m_ctx; @@ -360,13 +315,8 @@ static int wave5_vpu_enc_enum_framesizes(struct file *= f, void *fh, struct v4l2_f return -EINVAL; } =20 - fsize->type =3D V4L2_FRMSIZE_TYPE_CONTINUOUS; - fsize->stepwise.min_width =3D vpu_fmt->min_width; - fsize->stepwise.max_width =3D vpu_fmt->max_width; - fsize->stepwise.step_width =3D 1; - fsize->stepwise.min_height =3D vpu_fmt->min_height; - fsize->stepwise.max_height =3D vpu_fmt->max_height; - fsize->stepwise.step_height =3D 1; + fsize->type =3D V4L2_FRMSIZE_TYPE_STEPWISE; + fsize->stepwise =3D enc_frmsize[VPU_FMT_TYPE_CODEC]; =20 return 0; } @@ -391,7 +341,9 @@ static int wave5_vpu_enc_enum_fmt_cap(struct file *file= , void *fh, struct v4l2_f static int wave5_vpu_enc_try_fmt_cap(struct file *file, void *fh, struct v= 4l2_format *f) { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); + const struct v4l2_frmsize_stepwise *frmsize; const struct vpu_format *vpu_fmt; + int width, height; =20 dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: = %u field: %u\n", __func__, f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.width, f->fmt.pix_mp.= height, @@ -399,20 +351,19 @@ static int wave5_vpu_enc_try_fmt_cap(struct file *fil= e, void *fh, struct v4l2_fo =20 vpu_fmt =3D wave5_find_vpu_fmt(f->fmt.pix_mp.pixelformat, enc_fmt_list[VP= U_FMT_TYPE_CODEC]); if (!vpu_fmt) { + width =3D inst->dst_fmt.width; + height =3D inst->dst_fmt.height; f->fmt.pix_mp.pixelformat =3D inst->dst_fmt.pixelformat; - f->fmt.pix_mp.num_planes =3D inst->dst_fmt.num_planes; - wave5_update_pix_fmt(&f->fmt.pix_mp, inst->dst_fmt.width, inst->dst_fmt.= height); + frmsize =3D &enc_frmsize[VPU_FMT_TYPE_CODEC]; } else { - int width =3D clamp(f->fmt.pix_mp.width, vpu_fmt->min_width, vpu_fmt->ma= x_width); - int height =3D clamp(f->fmt.pix_mp.height, vpu_fmt->min_height, vpu_fmt-= >max_height); - + width =3D f->fmt.pix_mp.width; + height =3D f->fmt.pix_mp.height; f->fmt.pix_mp.pixelformat =3D vpu_fmt->v4l2_pix_fmt; - f->fmt.pix_mp.num_planes =3D 1; - wave5_update_pix_fmt(&f->fmt.pix_mp, width, height); + frmsize =3D vpu_fmt->v4l2_frmsize; } =20 - f->fmt.pix_mp.flags =3D 0; - f->fmt.pix_mp.field =3D V4L2_FIELD_NONE; + wave5_update_pix_fmt(&f->fmt.pix_mp, VPU_FMT_TYPE_CODEC, + width, height, frmsize); f->fmt.pix_mp.colorspace =3D inst->colorspace; f->fmt.pix_mp.ycbcr_enc =3D inst->ycbcr_enc; f->fmt.pix_mp.quantization =3D inst->quantization; @@ -499,7 +450,9 @@ static int wave5_vpu_enc_enum_fmt_out(struct file *file= , void *fh, struct v4l2_f static int wave5_vpu_enc_try_fmt_out(struct file *file, void *fh, struct v= 4l2_format *f) { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); + const struct v4l2_frmsize_stepwise *frmsize; const struct vpu_format *vpu_fmt; + int width, height; =20 dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: = %u field: %u\n", __func__, f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.width, f->fmt.pix_mp.= height, @@ -507,28 +460,26 @@ static int wave5_vpu_enc_try_fmt_out(struct file *fil= e, void *fh, struct v4l2_fo =20 vpu_fmt =3D wave5_find_vpu_fmt(f->fmt.pix_mp.pixelformat, enc_fmt_list[VP= U_FMT_TYPE_RAW]); if (!vpu_fmt) { + width =3D inst->src_fmt.width; + height =3D inst->src_fmt.height; f->fmt.pix_mp.pixelformat =3D inst->src_fmt.pixelformat; - f->fmt.pix_mp.num_planes =3D inst->src_fmt.num_planes; - wave5_update_pix_fmt(&f->fmt.pix_mp, inst->src_fmt.width, inst->src_fmt.= height); + frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW]; } else { - int width =3D clamp(f->fmt.pix_mp.width, vpu_fmt->min_width, vpu_fmt->ma= x_width); - int height =3D clamp(f->fmt.pix_mp.height, vpu_fmt->min_height, vpu_fmt-= >max_height); - const struct v4l2_format_info *info =3D v4l2_format_info(vpu_fmt->v4l2_p= ix_fmt); - + width =3D f->fmt.pix_mp.width; + height =3D f->fmt.pix_mp.height; f->fmt.pix_mp.pixelformat =3D vpu_fmt->v4l2_pix_fmt; - f->fmt.pix_mp.num_planes =3D info->mem_planes; - wave5_update_pix_fmt(&f->fmt.pix_mp, width, height); + frmsize =3D vpu_fmt->v4l2_frmsize; } =20 - f->fmt.pix_mp.flags =3D 0; - f->fmt.pix_mp.field =3D V4L2_FIELD_NONE; - + wave5_update_pix_fmt(&f->fmt.pix_mp, VPU_FMT_TYPE_RAW, + width, height, frmsize); return 0; } =20 static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l= 2_format *f) { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); + const struct vpu_format *vpu_fmt; int i, ret; =20 dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: = %u field: %u\n", @@ -568,7 +519,15 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, = void *fh, struct v4l2_form inst->quantization =3D f->fmt.pix_mp.quantization; inst->xfer_func =3D f->fmt.pix_mp.xfer_func; =20 - wave5_update_pix_fmt(&inst->dst_fmt, f->fmt.pix_mp.width, f->fmt.pix_mp.h= eight); + vpu_fmt =3D wave5_find_vpu_fmt(inst->dst_fmt.pixelformat, enc_fmt_list[VP= U_FMT_TYPE_CODEC]); + if (!vpu_fmt) + return -EINVAL; + + wave5_update_pix_fmt(&inst->dst_fmt, VPU_FMT_TYPE_CODEC, + f->fmt.pix_mp.width, f->fmt.pix_mp.height, + vpu_fmt->v4l2_frmsize); + inst->conf_win.width =3D inst->dst_fmt.width; + inst->conf_win.height =3D inst->dst_fmt.height; =20 return 0; } @@ -584,12 +543,17 @@ static int wave5_vpu_enc_g_selection(struct file *fil= e, void *fh, struct v4l2_se switch (s->target) { case V4L2_SEL_TGT_CROP_DEFAULT: case V4L2_SEL_TGT_CROP_BOUNDS: - case V4L2_SEL_TGT_CROP: s->r.left =3D 0; s->r.top =3D 0; s->r.width =3D inst->dst_fmt.width; s->r.height =3D inst->dst_fmt.height; break; + case V4L2_SEL_TGT_CROP: + s->r.left =3D 0; + s->r.top =3D 0; + s->r.width =3D inst->conf_win.width; + s->r.height =3D inst->conf_win.height; + break; default: return -EINVAL; } @@ -612,8 +576,10 @@ static int wave5_vpu_enc_s_selection(struct file *file= , void *fh, struct v4l2_se =20 s->r.left =3D 0; s->r.top =3D 0; - s->r.width =3D inst->src_fmt.width; - s->r.height =3D inst->src_fmt.height; + s->r.width =3D min(s->r.width, inst->dst_fmt.width); + s->r.height =3D min(s->r.height, inst->dst_fmt.height); + + inst->conf_win =3D s->r; =20 return 0; } @@ -1151,8 +1117,8 @@ static void wave5_set_enc_openparam(struct enc_open_p= aram *open_param, open_param->wave_param.lambda_scaling_enable =3D 1; =20 open_param->line_buf_int_en =3D true; - open_param->pic_width =3D inst->dst_fmt.width; - open_param->pic_height =3D inst->dst_fmt.height; + open_param->pic_width =3D inst->conf_win.width; + open_param->pic_height =3D inst->conf_win.height; open_param->frame_rate_info =3D inst->frame_rate; open_param->rc_enable =3D inst->rc_enable; if (inst->rc_enable) { @@ -1456,20 +1422,15 @@ static const struct vb2_ops wave5_vpu_enc_vb2_ops = =3D { static void wave5_set_default_format(struct v4l2_pix_format_mplane *src_fm= t, struct v4l2_pix_format_mplane *dst_fmt) { - unsigned int src_pix_fmt =3D enc_fmt_list[VPU_FMT_TYPE_RAW][0].v4l2_pix_f= mt; - const struct v4l2_format_info *src_fmt_info =3D v4l2_format_info(src_pix_= fmt); - - src_fmt->pixelformat =3D src_pix_fmt; - src_fmt->field =3D V4L2_FIELD_NONE; - src_fmt->flags =3D 0; - src_fmt->num_planes =3D src_fmt_info->mem_planes; - wave5_update_pix_fmt(src_fmt, 416, 240); + src_fmt->pixelformat =3D enc_fmt_list[VPU_FMT_TYPE_RAW][0].v4l2_pix_fmt; + wave5_update_pix_fmt(src_fmt, VPU_FMT_TYPE_RAW, + W5_DEF_ENC_PIC_WIDTH, W5_DEF_ENC_PIC_HEIGHT, + &enc_frmsize[VPU_FMT_TYPE_RAW]); =20 dst_fmt->pixelformat =3D enc_fmt_list[VPU_FMT_TYPE_CODEC][0].v4l2_pix_fmt; - dst_fmt->field =3D V4L2_FIELD_NONE; - dst_fmt->flags =3D 0; - dst_fmt->num_planes =3D 1; - wave5_update_pix_fmt(dst_fmt, 416, 240); + wave5_update_pix_fmt(dst_fmt, VPU_FMT_TYPE_CODEC, + W5_DEF_ENC_PIC_WIDTH, W5_DEF_ENC_PIC_HEIGHT, + &enc_frmsize[VPU_FMT_TYPE_CODEC]); } =20 static int wave5_vpu_enc_queue_init(void *priv, struct vb2_queue *src_vq, = struct vb2_queue *dst_vq) @@ -1733,6 +1694,8 @@ static int wave5_vpu_open_enc(struct file *filp) v4l2_ctrl_handler_setup(v4l2_ctrl_hdl); =20 wave5_set_default_format(&inst->src_fmt, &inst->dst_fmt); + inst->conf_win.width =3D inst->dst_fmt.width; + inst->conf_win.height =3D inst->dst_fmt.height; inst->colorspace =3D V4L2_COLORSPACE_REC709; inst->ycbcr_enc =3D V4L2_YCBCR_ENC_DEFAULT; inst->quantization =3D V4L2_QUANTIZATION_DEFAULT; diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.h b/drivers= /media/platform/chips-media/wave5/wave5-vpu.h index 32b7fd3730b5..3847332551fc 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.h @@ -38,10 +38,7 @@ enum vpu_fmt_type { =20 struct vpu_format { unsigned int v4l2_pix_fmt; - unsigned int max_width; - unsigned int min_width; - unsigned int max_height; - unsigned int min_height; + const struct v4l2_frmsize_stepwise *v4l2_frmsize; }; =20 static inline struct vpu_instance *wave5_to_vpu_inst(struct v4l2_fh *vfh) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h b/d= rivers/media/platform/chips-media/wave5/wave5-vpuconfig.h index d9751eedb0f9..8e11d93ca38f 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h +++ b/drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h @@ -30,10 +30,29 @@ =20 #define MAX_NUM_INSTANCE 32 =20 -#define W5_MIN_ENC_PIC_WIDTH 256 -#define W5_MIN_ENC_PIC_HEIGHT 128 -#define W5_MAX_ENC_PIC_WIDTH 8192 -#define W5_MAX_ENC_PIC_HEIGHT 8192 +#define W5_DEF_DEC_PIC_WIDTH 720U +#define W5_DEF_DEC_PIC_HEIGHT 480U +#define W5_MIN_DEC_PIC_8_WIDTH 8U +#define W5_MIN_DEC_PIC_8_HEIGHT 8U +#define W5_MIN_DEC_PIC_32_WIDTH 32U +#define W5_MIN_DEC_PIC_32_HEIGHT 32U +#define W5_MAX_DEC_PIC_WIDTH 8192U +#define W5_MAX_DEC_PIC_HEIGHT 4320U +#define W5_DEC_CODEC_STEP_WIDTH 1U +#define W5_DEC_CODEC_STEP_HEIGHT 1U +#define W5_DEC_RAW_STEP_WIDTH 32U +#define W5_DEC_RAW_STEP_HEIGHT 16U + +#define W5_DEF_ENC_PIC_WIDTH 416U +#define W5_DEF_ENC_PIC_HEIGHT 240U +#define W5_MIN_ENC_PIC_WIDTH 256U +#define W5_MIN_ENC_PIC_HEIGHT 128U +#define W5_MAX_ENC_PIC_WIDTH 8192U +#define W5_MAX_ENC_PIC_HEIGHT 8192U +#define W5_ENC_CODEC_STEP_WIDTH 8U +#define W5_ENC_CODEC_STEP_HEIGHT 8U +#define W5_ENC_RAW_STEP_WIDTH 32U +#define W5_ENC_RAW_STEP_HEIGHT 16U =20 // application specific configuration #define VPU_ENC_TIMEOUT 60000 --=20 2.43.0 From nobody Thu Feb 12 15:47:21 2026 Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11020003.outbound.protection.outlook.com [52.101.154.3]) (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 D4A14172BB5; Tue, 11 Jun 2024 07:15:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.154.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090121; cv=fail; b=HLEGbwXQp+NxJNQGWueSylFT20dDyQ9TFFOw8eT07jPHHzgksaFs0C5TXISr+krHK8yIvX2ZzdMAJojLcKPuM2TC/Y+TQCkaxNA0n3pxm/OvgsSq6HtHP/McLGZ9B/tu2FSFhdqnjhuYdsfx5e75MLzTZlmwuytEnHUkXB9Ysqo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718090121; c=relaxed/simple; bh=VMtPjfoOC0XTH+riNVMx8QR0jvlY6HzL+4rikDpX08E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RQqN58R3HfWFYzPe2eqZ8pHOeMo9BKoqY+kG5JrYADyRjAE8S9OoK+KrWZcE/D8E+BQblS6h0eqC7Elc9ifsTWqqQ8yTf9MD8NVp9by7BFmGHdMPpwjZPFl17ML7uwFS/5+EGcPiQvrNKEFSiOCeRs29gVwzlBsn59/UdKwiZbM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com; spf=pass smtp.mailfrom=chipsnmedia.com; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b=fAUnG+kJ; arc=fail smtp.client-ip=52.101.154.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chipsnmedia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chipsnmedia.com header.i=@chipsnmedia.com header.b="fAUnG+kJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hRXwJeDAoEIffoVg2VAjqQ9phr6NHTNkP21Y5huYHliDaWxYy+FpLMMU+w0b46qsJJVK4v9xtzgkjULoXVFkatisTkHi07zrlsZkCOXRIK3t/A9+8lDQYZSLChDpqab/SJxwet19s7KEHfGE9b6enrGBNuidBlZGniqJqTUDfm49V1EqUU5EOsKlYsc/6qzqQbiQy29GwMviNjzHeOh+7QPtgmtJbJMRMxrCKMxPmPfCrkppdu7gnUWw8doatKYO2Muu7SquVDg75YotQxvxpbxHXqi31qSPUtC1Z88n+e2XZVefCG7WuzOHbgrayMlLW92FWEYFA97f4i5QSnNVZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r0rAwfhgGXe8i8mWUYHlL3qQfx2HZL4rsIULoSdXt5Y=; b=ZGsco1arTx2hBRTUsIOIkIxv5F7Y2aHBdZmmdEQcusfGv+bAkpissIlcFyQO7nrEJAHNbNd0vw4I1ONZ+qTOTvx6F9OqY1WmjToCHnmCFhIH/nLfTs7gbSDtjkoS50zCIWQxOUo+XpWvJz+sRznKx9H0QJU6WzPRo6o3xRtqslokqMobtZ+eFzTiKLGCD42pHkdg35zdFHx5grgSPH837xsw/A2a50gq42/Wa9P+gAy1QgyENhPqSj1sMCfqNKhh1DEQY4A34Qborh/fPsylUTJpdr0R6qeyD129/o2Cewive/O83sWMrxO4ueZyS/SbPuwGOd2zFlXAQmMMPdB+TA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=chipsnmedia.com; dmarc=pass action=none header.from=chipsnmedia.com; dkim=pass header.d=chipsnmedia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chipsnmedia.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r0rAwfhgGXe8i8mWUYHlL3qQfx2HZL4rsIULoSdXt5Y=; b=fAUnG+kJR7slXPP676MRLfkNy2PdBWmnrntSfA1j9Ks8dHzZMdVjAKDbeWhuqwJr5cSCo63Pb02eSsSISvinZVYWp/nzYJKKNsePQAAzWhDGRqEFnqZ/0grXWgncY4RSreRgUYyreujxrsRYEBO2n0mUPMrVWmrYxkJuujOgdXs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=chipsnmedia.com; Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) by SEWP216MB2956.KORP216.PROD.OUTLOOK.COM (2603:1096:101:295::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Tue, 11 Jun 2024 07:15:10 +0000 Received: from SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b]) by SE1P216MB1303.KORP216.PROD.OUTLOOK.COM ([fe80::b711:5ab1:b5a4:d01b%4]) with mapi id 15.20.7633.036; Tue, 11 Jun 2024 07:15:10 +0000 From: Jackson Lee To: mchehab@kernel.org, nicolas@ndufresne.ca, sebastian.fricke@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, nas.chung@chipsnmedia.com, lafley.kim@chipsnmedia.com, b-brnich@ti.com, jackson.lee@chipsnmedia.com, Nicolas Dufresne Subject: [PATCH v5 4/4] media: chips-media: wave5: Support YUV422 raw pixel-formats on the encoder. Date: Tue, 11 Jun 2024 16:15:01 +0900 Message-Id: <20240611071501.80-5-jackson.lee@chipsnmedia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240611071501.80-1-jackson.lee@chipsnmedia.com> References: <20240611071501.80-1-jackson.lee@chipsnmedia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SE2P216CA0014.KORP216.PROD.OUTLOOK.COM (2603:1096:101:117::11) To SE1P216MB1303.KORP216.PROD.OUTLOOK.COM (2603:1096:101:15::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SE1P216MB1303:EE_|SEWP216MB2956:EE_ X-MS-Office365-Filtering-Correlation-Id: 793cddaa-b995-42bd-8654-08dc89e63afc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015|52116005|38350700005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rUQeBllPyATxnW8xn+ysTt6zmdLMqTVKuudu+4KfhKndZLQsFGPLWo5d44Eh?= =?us-ascii?Q?X4kQ0MZtXAa/eAP9KSdrtCp4McWDD+19Gs24g/5R9lZqAf4oN+2FrFpvUKVO?= =?us-ascii?Q?h1u0iCOdp2lTi82zAJmiapM7LCKTvZ2Y7zkKdmm7LFA/8acFfWU1/zb9Q2b4?= =?us-ascii?Q?TZtTUoJSqQYRvgqJhwpcasl8Hi+HF6ux9Jgpl/KjoI2b/PTaqDMO8rt1CCMf?= =?us-ascii?Q?RCJ5oRt+gaRhjDjQ6m54AEx4dsuxLdElBVtj5h2Rc9GIraZz5rToBQdGWXPJ?= =?us-ascii?Q?6ZisQvFWtuRzrB7j1dStSQ4ttaEQOYMwnapFeuN3OrwnlPI/OtgdoKhV+dDe?= =?us-ascii?Q?4fopGGdp56eXIZjKszlsxMCIkm/LrXvSs9jsa/UvnuJyrIo86bpBQoFKV5i3?= =?us-ascii?Q?AciN+rHufekiGPeG0tr8jdGKKVOTPI2DIhSfNZIKvxqShwl1TfgH/6atB4sP?= =?us-ascii?Q?nPUIAmPmKKljDDpBTK/2uun/TRfWD8JhiyUZd2s9JcTSWk22y79SC9vD9Pxd?= =?us-ascii?Q?a9ctoVJN4O8/zd+BP2lUrMqaSPsATC8Nf3ec/NFcFxRAPMZDuS7BIYHGEys3?= =?us-ascii?Q?fNpQmjlJcmiVfUSjt06A6GoJtvKq7ADGG6Zm9i4UgzAIX3fgJrLfRM4Mc/vv?= =?us-ascii?Q?FP3UddXUDTb0Iaotiw+vX3lh5xxTCifjwCIupqAoVHkePDnWa51Jk1j84iGI?= =?us-ascii?Q?0U1wk39B5pERls2yQZuCrV6G5GiP7+DOJ1zuGEkg0lrCQwb0l9mBZ4hKEYPV?= =?us-ascii?Q?fQ5X8NRwJzw8od6hb2Y04xHMA4UTtnJc95f5xVjROZ+GPtgBe3m1d/uOUacp?= =?us-ascii?Q?wGY3UcYlIIgFhYh5oJtyVQ7rONM3R9h7MI+1JdLTpXwZf91+bNVxjnCAJihb?= =?us-ascii?Q?9q2C2s+0D2QyMUkmWzBEgRKM/FbzkvoHUb5UarHq8/tSExjJYTzFEmG713MA?= =?us-ascii?Q?nvB4zi8635XHGYsoVwql/qLKdyD6BUL3VVjccR7s7srCsCTosaWSd8NzLcop?= =?us-ascii?Q?G5kcp3Ol90NQjhT5mvn81TMPHzOEKQbWQsfc5NuoOdyQWGQl2YVeVzctKGm9?= =?us-ascii?Q?JC+XsQ+juGKI4rfAP4HNoFSEO/HkpEuZv/5q31nLAjYoz3xwcHEbwpFBvkLy?= =?us-ascii?Q?CeA9AFoCgipOIRtDztT1VdTLMSxNhUZNHaF0EdE0H5r4g087L78c/xs4oQAs?= =?us-ascii?Q?wxkQg8NNsxq7j73GiBIbPhyqtsF62DRKDDGDwEY4x3+Zo+0IC3wGt2Mhy5fK?= =?us-ascii?Q?RyxZ3HK/WmyUx+rncjITvtw29nsaIUVqMBzqGWoFlBKrfAniFcaTObsJcpoY?= =?us-ascii?Q?y90MQhYYIr0CTtTVzF00S5Gw9XFtI3BY8cmPJrO6FISOnAxOJRD9guPud/My?= =?us-ascii?Q?ISq3sMk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SE1P216MB1303.KORP216.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015)(52116005)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?z2IzdICBmeD8FkrQq/mnhbbiD4r5naIRL5yMOrmZUJ0dh1RxQn87tJvOfF5x?= =?us-ascii?Q?U+cl90xcFFIqZH+a0Sz3BSMtKrXOAYHi9iX4jFQPp/AqTeSVt97mLfw/1wZT?= =?us-ascii?Q?P1AyxBdjnQTlEcM44Nz6gY+Lf6HvaQZCe4oVkJ3v884u0WAW3/uVq7E1zEkV?= =?us-ascii?Q?pFUcmEV8Y08KH8o00t1aPuVK+f4ISw3PWjnkxFrEvrQV32i/Sjho5jsUgbEE?= =?us-ascii?Q?U0eJofeIuz4mg5qQ7TvpURfZqnUqU464z7P4401Z+3lLWWp5WwmOrcpZeF8/?= =?us-ascii?Q?CvVwehABkJWVvf7eJfMW4sWqfo+SCdo3wdZpDzxwdfIFU7At/C4pfFeQnNzn?= =?us-ascii?Q?ssO2LglNrg9u4v+IrcKI7hyUXhpaUtadvyBLeubPfk3qQUSOm6dYvQGpgqhu?= =?us-ascii?Q?vy3IplhiJs67Pk4egGvlhPhkBbKfsVj3RViZCSMYL4z34q9Y46J7x0SV7aph?= =?us-ascii?Q?7gZzEQBcT+9JvgGo8nugUQQRzpkJ2FiEMWXDD1/bXy/BM55yJXzUFYxIWmg5?= =?us-ascii?Q?6sjg6Tj2FmAerQFKYdnF68u12eMN/s1aQWkZYvoz6E59cWUZHsDxRw/GhTGw?= =?us-ascii?Q?ayAju998cGrjUO+MQVFdaNWbqm8OQMX8A+CgHB6InBHY99coxbdovasUUWxj?= =?us-ascii?Q?7bpUELmsAJE2rbY2aikHl7FPqMXmQ+YOjNKmu8fhHpzdHIFuvGSgF8chq/yh?= =?us-ascii?Q?QRncBTN8TUR+7/auwdTIu5ycBFGMSlXEiYYNTvBjPySTk7yR1PZCqz+Pi9V3?= =?us-ascii?Q?8hlRehoulxRm5sG3pPwOrqJn2JjlGjnt4eb7hiPzR7Vefp9jGPlpmH6jH3xu?= =?us-ascii?Q?uIQH7vBp/GmXbVAH/0VGt1iBGilFvv//EnV6KKUCgByaoOEuRnmqz7iK4eWn?= =?us-ascii?Q?kk0L88n7dGY6NBquojyfZYUXPlZuYrhpylZ7TgMiUGuM6tjVvaI25QhPsc1u?= =?us-ascii?Q?N3mIX0XwbAh0oi78g7UNxvqXX8NItG63tCRezSUMrny6p4mBX7H2+bhW50be?= =?us-ascii?Q?brUsXgAVsIOmWDN6vL4yU9Qv5rdxg/YPoNIzwD4BZa0+5y1uBTunU6OFTvxM?= =?us-ascii?Q?vhG/q0sxSuK1IanHn4AgRl/3NRRliHl32VS4XUK87ICciePkISkwc7T4IoA6?= =?us-ascii?Q?EChBVXLTdvOOA+ZVciyoCTsceRJxWlNriaZJ0I0JGw65+UJS4UbUO+GnNHEz?= =?us-ascii?Q?jhx/Tp1NmLr/+7BarPA1j+dZrSHe7VzpIrS4AVulWgy+uquCUsQjVxvhV6O5?= =?us-ascii?Q?/117iqFTP4HnD2SgjuA5dPSB0Gwuc+MZr3sWT4wybnwhekmki+A7AN5ql5qo?= =?us-ascii?Q?S3lsGwjcRAkbix30RdWp0WEYN0X8EORCZI76YeB+g+qFoFcsrYe0kKanyvhk?= =?us-ascii?Q?CgfsuSlgrD4lx+c+Erzp70lu+tUG7/Kqh6KH0D6VWgA5k2Z17T6FWZrZd+5b?= =?us-ascii?Q?GgLdhYA23+47FCTrmLXeFLd5y76xwedmzda6c2oqVE86SKdd0JMZXrUoydVd?= =?us-ascii?Q?vYphEPL+fIz1bc1fyIwcwHiwAneUDBspjhuaJCYXb6DtCVLLBMoRM77RNKCs?= =?us-ascii?Q?UkIQJz6gfHY8MsdKSjj6S+8KvCFbmAEsWbj15mDgos9SYIv7o76R5uax6TVD?= =?us-ascii?Q?QQ=3D=3D?= X-OriginatorOrg: chipsnmedia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 793cddaa-b995-42bd-8654-08dc89e63afc X-MS-Exchange-CrossTenant-AuthSource: SE1P216MB1303.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 07:15:10.5500 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4d70c8e9-142b-4389-b7f2-fa8a3c68c467 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VADULM5Ju2LpOxrXnQA2CRO5C0oyF/yyk7PS4sgegecbZFyaV2NIRTwctvz4ad8KnbOCgmrLohYxJ5e0NgkyGNQueLnTqR1Jb5D+GK//vOI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEWP216MB2956 Content-Type: text/plain; charset="utf-8" From: "jackson.lee" Add support for the YUV422P, NV16, NV61, YUV422M, NV16M, NV61M raw pixel-formats to the Wave5 encoder. All these formats have a chroma subsampling ratio of 4:2:2 and therefore require a new image size calculation as the driver previously only handled a ratio of 4:2:0. Signed-off-by: Jackson.lee Signed-off-by: Nas Chung Reviewed-by: Nicolas Dufresne --- .../chips-media/wave5/wave5-vpu-enc.c | 89 +++++++++++++++---- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/dri= vers/media/platform/chips-media/wave5/wave5-vpu-enc.c index a470f24cbabe..fee24b427fd1 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c @@ -66,6 +66,30 @@ static const struct vpu_format enc_fmt_list[FMT_TYPES][M= AX_FMTS] =3D { .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV21M, .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], }, + { + .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV422P, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV16, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV61, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt =3D V4L2_PIX_FMT_YUV422M, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV16M, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt =3D V4L2_PIX_FMT_NV61M, + .v4l2_frmsize =3D &enc_frmsize[VPU_FMT_TYPE_RAW], + }, } }; =20 @@ -109,13 +133,26 @@ static int start_encode(struct vpu_instance *inst, u3= 2 *fail_res) struct vb2_v4l2_buffer *dst_buf; struct frame_buffer frame_buf; struct enc_param pic_param; - u32 stride =3D ALIGN(inst->dst_fmt.width, 32); - u32 luma_size =3D (stride * inst->dst_fmt.height); - u32 chroma_size =3D ((stride / 2) * (inst->dst_fmt.height / 2)); + const struct v4l2_format_info *info; + u32 stride =3D inst->src_fmt.plane_fmt[0].bytesperline; + u32 luma_size =3D 0; + u32 chroma_size =3D 0; =20 memset(&pic_param, 0, sizeof(struct enc_param)); memset(&frame_buf, 0, sizeof(struct frame_buffer)); =20 + info =3D v4l2_format_info(inst->src_fmt.pixelformat); + if (!info) + return -EINVAL; + + if (info->mem_planes =3D=3D 1) { + luma_size =3D stride * inst->dst_fmt.height; + chroma_size =3D luma_size / (info->hdiv * info->vdiv); + } else { + luma_size =3D inst->src_fmt.plane_fmt[0].sizeimage; + chroma_size =3D inst->src_fmt.plane_fmt[1].sizeimage; + } + dst_buf =3D v4l2_m2m_next_dst_buf(m2m_ctx); if (!dst_buf) { dev_dbg(inst->dev->dev, "%s: No destination buffer found\n", __func__); @@ -480,6 +517,7 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, v= oid *fh, struct v4l2_form { struct vpu_instance *inst =3D wave5_to_vpu_inst(fh); const struct vpu_format *vpu_fmt; + const struct v4l2_format_info *info; int i, ret; =20 dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: = %u field: %u\n", @@ -501,16 +539,20 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file,= void *fh, struct v4l2_form inst->src_fmt.plane_fmt[i].sizeimage =3D f->fmt.pix_mp.plane_fmt[i].size= image; } =20 - if (inst->src_fmt.pixelformat =3D=3D V4L2_PIX_FMT_NV12 || - inst->src_fmt.pixelformat =3D=3D V4L2_PIX_FMT_NV12M) { - inst->cbcr_interleave =3D true; - inst->nv21 =3D false; - } else if (inst->src_fmt.pixelformat =3D=3D V4L2_PIX_FMT_NV21 || - inst->src_fmt.pixelformat =3D=3D V4L2_PIX_FMT_NV21M) { - inst->cbcr_interleave =3D true; + info =3D v4l2_format_info(inst->src_fmt.pixelformat); + if (!info) + return -EINVAL; + + inst->cbcr_interleave =3D (info->comp_planes =3D=3D 2) ? true : false; + + switch (inst->src_fmt.pixelformat) { + case V4L2_PIX_FMT_NV21: + case V4L2_PIX_FMT_NV21M: + case V4L2_PIX_FMT_NV61: + case V4L2_PIX_FMT_NV61M: inst->nv21 =3D true; - } else { - inst->cbcr_interleave =3D false; + break; + default: inst->nv21 =3D false; } =20 @@ -1095,13 +1137,23 @@ static void wave5_vpu_enc_buf_queue(struct vb2_buff= er *vb) v4l2_m2m_buf_queue(m2m_ctx, vbuf); } =20 -static void wave5_set_enc_openparam(struct enc_open_param *open_param, - struct vpu_instance *inst) +static int wave5_set_enc_openparam(struct enc_open_param *open_param, + struct vpu_instance *inst) { struct enc_wave_param input =3D inst->enc_param; + const struct v4l2_format_info *info; u32 num_ctu_row =3D ALIGN(inst->dst_fmt.height, 64) / 64; u32 num_mb_row =3D ALIGN(inst->dst_fmt.height, 16) / 16; =20 + info =3D v4l2_format_info(inst->src_fmt.pixelformat); + if (!info) + return -EINVAL; + + if (info->hdiv =3D=3D 2 && info->vdiv =3D=3D 1) + open_param->src_format =3D FORMAT_422; + else + open_param->src_format =3D FORMAT_420; + open_param->wave_param.gop_preset_idx =3D PRESET_IDX_IPP_SINGLE; open_param->wave_param.hvs_qp_scale =3D 2; open_param->wave_param.hvs_max_delta_qp =3D 10; @@ -1190,6 +1242,8 @@ static void wave5_set_enc_openparam(struct enc_open_p= aram *open_param, open_param->wave_param.intra_refresh_arg =3D num_ctu_row; } open_param->wave_param.forced_idr_header_enable =3D input.forced_idr_head= er_enable; + + return 0; } =20 static int initialize_sequence(struct vpu_instance *inst) @@ -1285,7 +1339,12 @@ static int wave5_vpu_enc_start_streaming(struct vb2_= queue *q, unsigned int count =20 memset(&open_param, 0, sizeof(struct enc_open_param)); =20 - wave5_set_enc_openparam(&open_param, inst); + ret =3D wave5_set_enc_openparam(&open_param, inst); + if (ret) { + dev_dbg(inst->dev->dev, "%s: wave5_set_enc_openparam, fail: %d\n", + __func__, ret); + goto return_buffers; + } =20 ret =3D wave5_vpu_enc_open(inst, &open_param); if (ret) { --=20 2.43.0