From patchwork Wed Jun 13 15:07:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 138487 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp848177lji; Wed, 13 Jun 2018 08:09:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJeyqg/dCTFNVC3eJRIeao9GjDTRMLLQFwqMC1qC8cKpyojffqCrBs5AyhwmulgQ4Xw8Wyk X-Received: by 2002:a62:e117:: with SMTP id q23-v6mr5350756pfh.75.1528902588582; Wed, 13 Jun 2018 08:09:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528902588; cv=none; d=google.com; s=arc-20160816; b=kCBMGHJNBpdX27nR+VvppvEOzrwOqqupw424EcrcmKMuTwj5E4ofOHLZ1XiKu3wMT8 q2xDSKHEpSrYVlubiyI7DnPVHvo2Crsnq/pML/Tub9aVX9pn8MtrEs6rpLykd6tTkWV8 q0bR1+0p24bEK4QPOjaQp8E7xSkANzYp2QPfs6f0BU54Cau8d/QkmHXAijJmBwJIVbRw x9juW1/RQWJtz1RhoAvEdg3xOD3J8JKL3z/08852mSb3sVzRgTPVuadG3LyZgUjAMklv wuQv9XcOzGrQn5F8zW6BXobyhOBD3bkxNNCtnj+L+humTgylmuWZId948pcscKnExxkT +B5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=VRMNPzwCVtxgb0LfMFtJgW6g4iKfhAD4kYYPw52509I=; b=bxg/GzmX+VrOrZBimEvI02H0TqBgpSb4sAZhcjg04sXlbOeny2eBEqhpiwIz5pWGuc hCVWRSb+ZJsA80BKzVElfxO80xUSHYt8A/RpNSdNgX9kok0ovWDo3CvIvMbSz/TFXm/8 1GmthtnntkNo+YHkdyJ17gd2mX1UHVezL/GpGFWDdLBFy+y9fxkU9ZtieF4oooNI+n5P h29qqcfI9myriKfmJYTcp/A/i166ROO92mTX3MF6PzYMQsY6xL6+GzNmzqGOnaf+lR/q EQqk80G66jwQmvglHCJE6G/Y3AN4C/vpUbDp1DUOB2x3Rrecpi92akGIE3Jj2yCZ5Pub ERUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OoBGAH3x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id g83-v6si3138772pfg.225.2018.06.13.08.09.48; Wed, 13 Jun 2018 08:09:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OoBGAH3x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S936075AbeFMPJn (ORCPT + 30 others); Wed, 13 Jun 2018 11:09:43 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34378 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964852AbeFMPJi (ORCPT ); Wed, 13 Jun 2018 11:09:38 -0400 Received: by mail-wr0-f196.google.com with SMTP id a12-v6so3165136wro.1 for ; Wed, 13 Jun 2018 08:09:37 -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; bh=VRMNPzwCVtxgb0LfMFtJgW6g4iKfhAD4kYYPw52509I=; b=OoBGAH3xOCYloy6CF7yFWDTUCJCYyO/yPSHl0WZ9/P9oswx2CHsRAtKRpHNCLEBmxD 9aFvCzzfAkDa2qC9kBgpUk29i6+KAShPU4sCgUGLJyvGZ0Cwl2bSGK+Srhy2GgMkndjQ 5ruxZAEUuDWlpA+hqvuQUSvMaBLJvT6qRv5oY= 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=VRMNPzwCVtxgb0LfMFtJgW6g4iKfhAD4kYYPw52509I=; b=m/PsVdtE0S0LvorokiAJg2j0r9k58EZDWPYwgERf5xTx3HRlO/hmwV0h0hDFNlXut8 OK2b8thzeAkdE6aKu+b76Tj2KDyJw+dT3vEuA5cT3XcRCHqyiqfkQVRu74DvYMupmqKR ZEcsUFrxMKSTE3lBKcL91yNGQcVNYUOyqQzTNwiH/4IDu0e5wNTzDcFjsuX0bq7VvFvy +VkdjQp2rsSBc1u/+NXWVp7krGZ4m8URdHP/K4ZDEYZtzXEBEFecPye4PujnPp/G2MzR 8d1qzL5nTsiOHyC16fgn6xBSvJPkKfUP2ukmHHM2lo+a/A2JXhim0cx4hpDB/cXaFxC8 4qLQ== X-Gm-Message-State: APt69E0Qi0X8lYRdO27iaW1L7m7dcL2Ysfy9pNEwKs6QZInY4vdrmtZu jHNOhYir1+3I2eUQMn02tBnkqw== X-Received: by 2002:adf:efcf:: with SMTP id i15-v6mr4795449wrp.195.1528902576980; Wed, 13 Jun 2018 08:09:36 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id e13-v6sm2886548wrm.45.2018.06.13.08.09.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 08:09:36 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vikash Garodia , Tomasz Figa , Stanimir Varbanov Subject: [PATCH v3 21/27] venus: helpers: add a helper to return opb buffer sizes Date: Wed, 13 Jun 2018 18:07:55 +0300 Message-Id: <20180613150801.11702-22-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180613150801.11702-1-stanimir.varbanov@linaro.org> References: <20180613150801.11702-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a helper function to return current output picture buffer size. OPB sizes can vary depending on the selected decoder output(s). Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/core.h | 6 ++++++ drivers/media/platform/qcom/venus/helpers.c | 15 +++++++++++++++ drivers/media/platform/qcom/venus/helpers.h | 1 + 3 files changed, 22 insertions(+) -- 2.14.1 diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 1d1a59a5d343..f8e4d92ff0e1 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -239,6 +239,9 @@ struct venus_buffer { * @num_output_bufs: holds number of output buffers * @input_buf_size holds input buffer size * @output_buf_size: holds output buffer size + * @output2_buf_size: holds secondary decoder output buffer size + * @opb_buftype: output picture buffer type + * @opb_fmt: output picture buffer raw format * @reconfig: a flag raised by decoder when the stream resolution changed * @reconfig_width: holds the new width * @reconfig_height: holds the new height @@ -288,6 +291,9 @@ struct venus_inst { unsigned int num_output_bufs; unsigned int input_buf_size; unsigned int output_buf_size; + unsigned int output2_buf_size; + u32 opb_buftype; + u32 opb_fmt; bool reconfig; u32 reconfig_width; u32 reconfig_height; diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c index e332c9682b9c..6b31c91528ed 100644 --- a/drivers/media/platform/qcom/venus/helpers.c +++ b/drivers/media/platform/qcom/venus/helpers.c @@ -608,6 +608,21 @@ int venus_helper_set_bufsize(struct venus_inst *inst, u32 bufsize, u32 buftype) } EXPORT_SYMBOL_GPL(venus_helper_set_bufsize); +unsigned int venus_helper_get_opb_size(struct venus_inst *inst) +{ + /* the encoder has only one output */ + if (inst->session_type == VIDC_SESSION_TYPE_ENC) + return inst->output_buf_size; + + if (inst->opb_buftype == HFI_BUFFER_OUTPUT) + return inst->output_buf_size; + else if (inst->opb_buftype == HFI_BUFFER_OUTPUT2) + return inst->output2_buf_size; + + return 0; +} +EXPORT_SYMBOL_GPL(venus_helper_get_opb_size); + static void delayed_process_buf_func(struct work_struct *work) { struct venus_buffer *buf, *n; diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h index 8ff4bd3ef958..92be45894a69 100644 --- a/drivers/media/platform/qcom/venus/helpers.h +++ b/drivers/media/platform/qcom/venus/helpers.h @@ -48,6 +48,7 @@ int venus_helper_set_raw_format(struct venus_inst *inst, u32 hfi_format, int venus_helper_set_color_format(struct venus_inst *inst, u32 fmt); int venus_helper_set_dyn_bufmode(struct venus_inst *inst); int venus_helper_set_bufsize(struct venus_inst *inst, u32 bufsize, u32 buftype); +unsigned int venus_helper_get_opb_size(struct venus_inst *inst); void venus_helper_acquire_buf_ref(struct vb2_v4l2_buffer *vbuf); void venus_helper_release_buf_ref(struct venus_inst *inst, unsigned int idx); void venus_helper_init_instance(struct venus_inst *inst);