From patchwork Wed Apr 20 15:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 565020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 674E1C433EF for ; Wed, 20 Apr 2022 15:07:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380016AbiDTPKK (ORCPT ); Wed, 20 Apr 2022 11:10:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380007AbiDTPKJ (ORCPT ); Wed, 20 Apr 2022 11:10:09 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92C4F3B557 for ; Wed, 20 Apr 2022 08:07:22 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id g13so4192052ejb.4 for ; Wed, 20 Apr 2022 08:07:22 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=9CYSvm5V1sdHDF+1DOOdhxzb/TbaE3N1T5V45Q/q3iU=; b=iV+BX8J6eiPQ0Gr87b0pPAjxgYpB4lc6lLb3KhBPZ1hggG7okxyTKJaLZBI7/zntK0 tHCsOyJsKdx1AI17e26HVTluagsC5VMmoWCTohidXYxfQin6AG8pWnvjsAHGsW6IMNUy uPVed7xYqc8l9Hewe0bsM63jkv2AHvlJ9rSIM2wXTJNJJ4DOdSq4wE3jb6uEi9AYgmo9 rLgdkkRKBhYePnJsuJ8UREeGpBJyQxJS4ZJ9IefoKFhQMHZUSEWoGhAPXpTzO0/bwEgV J3bEjD74nJ3thpCRrLthBqZng1I94ukmrWIi9lC9GqHvMZOijlazQTjloqHVB8eiR+P2 FC9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9CYSvm5V1sdHDF+1DOOdhxzb/TbaE3N1T5V45Q/q3iU=; b=4+KXDut6hNo3AbxP+CZ59FJK4/JED+FftfbIOiQCMnDCW2+Rv6SLgYacSLPY0VZjZO 3tUHaCIYQmetzl/IvN9kv3eVCvlZfnaURL2QrGhW6gcP6cygJrOiK/YERXGUIeZ2AZWK mIRqHhONnorYygeECtmeQ6uWks8H6+SxMKJz9IHyxzrgFDx9wgRLdqAln0aspMQH8H6w LjYLsPxI90ah1g5nEgbLMos84qt3uSpMbAc2g2XBRJy6scWpH4kC2UDRYNdGy3nUQiuL xgOzDqqQIxMAZKQHJz0O4+1eWXizutfLv+6TpTCPf0EEcNaHXHvYleCO8H59VBpHAT2I eVDg== X-Gm-Message-State: AOAM5329TD5Nikcd7UybEu++A2INGAQRp4GmAcG7Ywem0wbKonkmQEoW mKgmx7ikHxKY5+FOsbVXDtTsxQ== X-Google-Smtp-Source: ABdhPJzOsn82ao1iPnKZtrbVAqHHfpL0MGaWxzcxfFTPHm+ghb7aB2icWW2mAmJo8Uw0uka/xUUGZQ== X-Received: by 2002:a17:906:948d:b0:6e8:bf62:baee with SMTP id t13-20020a170906948d00b006e8bf62baeemr18751790ejx.456.1650467241156; Wed, 20 Apr 2022 08:07:21 -0700 (PDT) Received: from localhost.localdomain (hst-208-209.medicom.bg. [84.238.208.209]) by smtp.gmail.com with ESMTPSA id zk19-20020a17090733d300b006f00e918483sm415262ejb.84.2022.04.20.08.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 08:07:20 -0700 (PDT) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: linux-arm-msm@vger.kernel.org, ezequiel@collabora.com, stanimir.varbanov@linaro.org, quic_vgarodia@quicinc.com, quic_majja@quicinc.com, quic_jdas@quicinc.com, Dikshita Agarwal Subject: [PATCH v6 2/2] venus: venc: Add support for intra-refresh type Date: Wed, 20 Apr 2022 18:07:04 +0300 Message-Id: <20220420150704.144000-3-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220420150704.144000-1-stanimir.varbanov@linaro.org> References: <20220420150704.144000-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dikshita Agarwal Add support for intra-refresh type v4l2 control. Signed-off-by: Dikshita Agarwal Acked-by: Hans Verkuil Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/venc.c | 6 +++++- drivers/media/platform/qcom/venus/venc_ctrls.c | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index c3023340d95c..d33825553edc 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -261,6 +261,7 @@ struct venc_controls { u32 header_mode; bool aud_enable; + u32 intra_refresh_type; u32 intra_refresh_period; struct { diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index adea4c3b8c20..86918aea1d24 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -893,8 +893,12 @@ static int venc_set_properties(struct venus_inst *inst) mbs++; mbs /= ctr->intra_refresh_period; - intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM; intra_refresh.cir_mbs = mbs; + if (ctr->intra_refresh_type == + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC) + intra_refresh.mode = HFI_INTRA_REFRESH_CYCLIC; + else + intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM; } ptype = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH; diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c index ea5805e71c14..ed44e5800759 100644 --- a/drivers/media/platform/qcom/venus/venc_ctrls.c +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c @@ -316,6 +316,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY: ctr->mastering = *ctrl->p_new.p_hdr10_mastering; break; + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE: + ctr->intra_refresh_type = ctrl->val; + break; case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD: ctr->intra_refresh_period = ctrl->val; break; @@ -582,6 +585,11 @@ int venc_ctrl_init(struct venus_inst *inst) V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY, v4l2_ctrl_ptr_create(NULL)); + v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops, + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE, + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC, + 0, V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM); + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0, ((4096 * 2304) >> 8), 1, 0);