From patchwork Mon Nov 9 17:35:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 320948 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp1921616ilc; Mon, 9 Nov 2020 09:36:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3zbtRgJfnHs622Gk/Wr38ls+dfvGnCOYMHiQvy4irSNm+WzoyxsFrpDstoHGimWrbueNF X-Received: by 2002:a17:906:57ca:: with SMTP id u10mr16770593ejr.389.1604943374552; Mon, 09 Nov 2020 09:36:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604943374; cv=none; d=google.com; s=arc-20160816; b=aV47KNUDVvr5cwlKxaDaPUYrzuoQ8HDhuEguTDFpfv+Q9EM39TFKETcq/pSXwTo1Uq FzQQ2twWoFar0xXW7Pu7VjFhVcLE7bzaxp5QWdqgPOylmrJ6UJs4kyX1OjhtstLV7vwC GXReMCpGH9bmRYXoizNYHApx4ogpEZEdflvTUrFBDjF8pWkE16OfuFxtdGnpUERtGJFU 0Qc0yCr6vaqp6uosfnDIDgnDBAnLbw6AP9iJMILLrknQYQDnucQwpSdeCXtUS2CONXOr gD2zIn+saGN5xC+9uXZYej/ggoVajCKNRA5728cFmguUYxfHuZKyQqkFme0UVoIOOgW2 giBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=SsKi06aFz0HTo2Yl+cJME4oxrb6MxPsHXouTbem6RGI=; b=RuykxTZraSFEYLld7ochMFt59BY99+8S6FOjKQp+0SsGy4/qYscV989eAdzZzDXu95 bwM5qQzlgik8/2pEuwmOQX2QVU1rCXpxIASGRrwbdpd2JsoqJrR08K9xTRWbaxqV5PJG L3FA6aVCUg2cQjQifqh9r8DR1J5hC0e2a15WurTIpno4sHU11/0azKd0OAEeV6yaZBTd zv+TDpPvqPeSDCJqMp0bWz0h8F+DG1NmDLrerumroW6oHzT2oVv/C2jnvCh+eKgI5e/M 2vm4vctnQGfA7k3q0nNmJLSvKtncXmxkJ0mwqAmOkYfjmEEex6COxCOoCe4r+8Su/CeI hFug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BFxRxbsn; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e15si7597803ejr.176.2020.11.09.09.36.14; Mon, 09 Nov 2020 09:36:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BFxRxbsn; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731988AbgKIRgL (ORCPT + 15 others); Mon, 9 Nov 2020 12:36:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731756AbgKIRgH (ORCPT ); Mon, 9 Nov 2020 12:36:07 -0500 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04E20C0613CF for ; Mon, 9 Nov 2020 09:36:07 -0800 (PST) Received: by mail-ed1-x544.google.com with SMTP id cq7so9452087edb.4 for ; Mon, 09 Nov 2020 09:36:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SsKi06aFz0HTo2Yl+cJME4oxrb6MxPsHXouTbem6RGI=; b=BFxRxbsn5xdgpJDxro2qTxpz/f0nOnFDLq48DGON105z4GLn5pgjkZnbCOd9mCkkZJ CRI0u8Or6ciO+QGVcFfMZ1RJovaGb7gOfORQp3Yv+95GSQ729HL+ZPkBSlN4p2BoJJOu aDMvNBe7de5MnwHxmWaio5Z6fbRhA3U3uIs0GyhYJ5WqAkRnJ/xmylnSx/Nzu2utmZck EBlHZp5yLxaMGD2b47Thvh57MEwg3LhvhFAkTNuys+cwXZUGrTHaOJ0uBGtz5nUlpsLX 9DvrAh/iAVOBaboXZsGireRxpymIWivTswiOZwjPQ09vE3FrOKoslXyiCLTQmHHUGNo0 0Qcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SsKi06aFz0HTo2Yl+cJME4oxrb6MxPsHXouTbem6RGI=; b=Ph1AduKS+KNbgKJn2QQvFKj1Wa2KH49sk9CDSs8CqIjbbX9UVGOtPpo3lCm9bBSL9G Le55cAuvfpIF1hKtoFnDR+3yX3cd5+SMPSHE51nDscHrF4HrRdlGrZgswVX+p1/ONFwH OmCtNrK3j97jOdcvMd8yn1jU4723jOCir9hhXKAxMiH752zMqFBuUYwZ2HucJuDn0zyE uN8u2GUphbaYP00WbYIazruM3dxa0WUOEHJcVsdesl22kMXrg9oE7KyaM5q/extJk+j8 DU+qwnViGM2e9eN9L79w0FRFOOQfPc1fh5o5k/qpJAe8RbuHrh6IGKLlcxNJVKENfB+4 ruGw== X-Gm-Message-State: AOAM531h3rAwp4G1NXyuL51TWPeInE5fL3CU+HI449mn20CTcjmCZiOO HN6QU74MJ0IMDmcWj+br6B4jXQ== X-Received: by 2002:a50:eb0a:: with SMTP id y10mr17307631edp.342.1604943365785; Mon, 09 Nov 2020 09:36:05 -0800 (PST) Received: from localhost.localdomain (hst-221-89.medicom.bg. [84.238.221.89]) by smtp.gmail.com with ESMTPSA id jw7sm9123981ejb.54.2020.11.09.09.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 09:36:05 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Kyungmin Park , Kamil Debski , Hans Verkuil , Ezequiel Garcia , Nicolas Dufresne , Marek Szyprowski , Stanimir Varbanov Subject: [PATCH 3/4] s5p-mfc: Use display delay and display enable std controls Date: Mon, 9 Nov 2020 19:35:40 +0200 Message-Id: <20201109173541.10016-4-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201109173541.10016-1-stanimir.varbanov@linaro.org> References: <20201109173541.10016-1-stanimir.varbanov@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use the standard display_delay and display_delay_enable controls, the legacy private MFC controls are kept for backward compatibility. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.17.1 Acked-by: Marek Szyprowski diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 61e144a35201..4a3e8e9bbff2 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -167,6 +167,13 @@ static struct mfc_control controls[] = { .step = 1, .default_value = 0, }, + { + .id = V4L2_CID_MPEG_VIDEO_DECODER_DISPLAY_DELAY, + .type = V4L2_CTRL_TYPE_INTEGER, + .minimum = 0, + .maximum = 16383, + .default_value = 0, + }, { .id = V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE, .type = V4L2_CTRL_TYPE_BOOLEAN, @@ -176,6 +183,13 @@ static struct mfc_control controls[] = { .step = 1, .default_value = 0, }, + { + .id = V4L2_CID_MPEG_VIDEO_DECODER_DISPLAY_DELAY_ENABLE, + .type = V4L2_CTRL_TYPE_BOOLEAN, + .minimum = 0, + .maximum = 1, + .default_value = 0, + }, { .id = V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER, .type = V4L2_CTRL_TYPE_BOOLEAN, @@ -690,9 +704,11 @@ static int s5p_mfc_dec_s_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY: + case V4L2_CID_MPEG_VIDEO_DECODER_DISPLAY_DELAY: ctx->display_delay = ctrl->val; break; case V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE: + case V4L2_CID_MPEG_VIDEO_DECODER_DISPLAY_DELAY_ENABLE: ctx->display_delay_enable = ctrl->val; break; case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: