Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp6298751pxb; Wed, 17 Feb 2021 00:14:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNhmaOAkE/2bhzICxWf8fuhdf/dqelwaATzRscrbRJ2ac9WGA7IvTav1n2DC+//HXQOL0d X-Received: by 2002:a17:907:7785:: with SMTP id ky5mr24848936ejc.176.1613549693961; Wed, 17 Feb 2021 00:14:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613549693; cv=none; d=google.com; s=arc-20160816; b=tVcK+pkpVwqwI4B0IzMdqp+CZFFytuohBVyzXlbz6x5L/dG1kCL+BPEmjxuGwUQhKX M9zsCzjhO+AuKefsZYH24/jqhQOQS/vRPUJgdFWJbohGVJ/aPqEiH6FrkXocGFstJZAN FZq3bC5Lajj7xonpLvXCApKxwKrouXctWtZslEjZT7DL+UnVkEuQyqQMva4a7IjYlzhf pcJcMpZlz/4gZ6GKAeBb0DUZqY2p705zOlJRtxhfM7Nd8APBcqNbb4nXNRoqhJ9DUcfx 5Z9E9J0bSMLgkUjE/uG8mR+3EITly9fZjNGHkyOdu7nlYCdMIOpzIBqzfM0/LC5oZuKM s7Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=1EcrYA1RD6f8M7XlluXyDgXETwIvMuf7+5L7ZntJyGU=; b=h8CP2NOS4rrenuUVocDqjQXH5LyDFbBf0DWC5hx4l2LobbuIFr7E1d/ucj3btyGyEy px7yawmoC8uRdXF7tLjxpyYCUv27vl8Um1jdhy2pJFEbEXTQuI0inJdIb3qwsKFxowIL 0XmcCcn8t9bvOsZeDgF7dlEjLXdCOegOU+uctmBgEInmrYtIHHeWTH9yg3kcH5VrGWeG NGtzkIwUtjAU+ICymMfZPBmBKAnqCdPcbrGNWFjqpNEioq2A3JztQXQ1wC33QAEDoDwx uY+qo8oVvsnKb9fhfBIhn8Ez0+trg0XpPYuUrl3FlgUjULh6AMkNrxa+hH+HCaNLaVL4 3B+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c8si1035567ejk.354.2021.02.17.00.14.31; Wed, 17 Feb 2021 00:14:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231947AbhBQIMR (ORCPT + 99 others); Wed, 17 Feb 2021 03:12:17 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:53296 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231805AbhBQIEw (ORCPT ); Wed, 17 Feb 2021 03:04:52 -0500 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:4cb:a870:fd6e:12cd:95d7:3350]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 1FEC51F4509B; Wed, 17 Feb 2021 08:04:10 +0000 (GMT) From: Benjamin Gaignard To: ezequiel@collabora.com, p.zabel@pengutronix.de, mchehab@kernel.org, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@siol.net, krzk@kernel.org, shengjiu.wang@nxp.com, adrian.ratiu@collabora.com, aisheng.dong@nxp.com, peng.fan@nxp.com, Anson.Huang@nxp.com, hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v1 15/18] media: hantro: handle V4L2_PIX_FMT_HEVC_SLICE control Date: Wed, 17 Feb 2021 09:03:03 +0100 Message-Id: <20210217080306.157876-16-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217080306.157876-1-benjamin.gaignard@collabora.com> References: <20210217080306.157876-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure that V4L2_PIX_FMT_HEVC_SLICE is correctly handle by v4l2 of the driver. Signed-off-by: Benjamin Gaignard Signed-off-by: Ezequiel Garcia Signed-off-by: Adrian Ratiu --- drivers/staging/media/hantro/hantro_v4l2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c index 1bc118e375a1..1608a3f78eaa 100644 --- a/drivers/staging/media/hantro/hantro_v4l2.c +++ b/drivers/staging/media/hantro/hantro_v4l2.c @@ -232,7 +232,7 @@ static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv, return 0; } -static int hantro_try_fmt(const struct hantro_ctx *ctx, +static int hantro_try_fmt(struct hantro_ctx *ctx, struct v4l2_pix_format_mplane *pix_mp, enum v4l2_buf_type type) { @@ -390,6 +390,7 @@ hantro_update_requires_request(struct hantro_ctx *ctx, u32 fourcc) case V4L2_PIX_FMT_MPEG2_SLICE: case V4L2_PIX_FMT_VP8_FRAME: case V4L2_PIX_FMT_H264_SLICE: + case V4L2_PIX_FMT_HEVC_SLICE: ctx->fh.m2m_ctx->out_q_ctx.q.requires_requests = true; break; default: -- 2.25.1