From patchwork Thu Jul 5 13:03:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 141123 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1918731ljj; Thu, 5 Jul 2018 06:05:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeQUnI/zes9hyU0xzhRV7/zydqtJJ+y9PvRJcSqs7g3mJOCFAW7kpunUOvLf3dEwUSoTT7T X-Received: by 2002:a17:902:d692:: with SMTP id v18-v6mr6181573ply.59.1530795931083; Thu, 05 Jul 2018 06:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530795931; cv=none; d=google.com; s=arc-20160816; b=rUsbm3SmelfamAWUotM8tKQEymOpHLGrOyf8wU+SRu3uWgom0w0KAppgjLiqX8JTkN poCxbgr8cEO68OT44canWJc5FE92sKhXhDgCnK/VMi/pfGcBYBXmbY8E0H0cz4T4qtnv HRFTUOQIVkJRs5UenSNyWlMKc5S3HxFZZcZ3RwvMFJj4I11YVcDnlTXUlCLutDEYUNz9 zceJDXsYMn/M07xzFNmFZDlKwDJSsoLueXoEBi+/edmr549nodao+l3aP+EaMGS8gyNV RBWrkBFWWFErbfapj9uUBebMztmcgjcgtmx+IAf1DdlSQ8HZFRDU5QV5c/TEFWSi/66s 7tYw== 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=m7EbUSCixlczjT8GRHqc9JZ/Q677zWmKsckfCGoGQ9s=; b=APeA3de85fOmWgqPFGLjDuNbGJSI8ffvNl9NRPvgMGD/GNmWX6jcG9To8db182A8lT 0yaJGZR6G56gfvfp0Ezc68Q7k8jjReHU2d45NxxRz0NbRBExsWU0SqNjJ+xG/mgGnOFV eo3zB/kLPKYeSQb+qISIMQDAO3eQAh0gYzm6/YWTnFL0TTQxZd7pIGMeEEcp3hZHghcK i98fhh6Ap0Hvk/4T47p4wNA8DoKcrQKgRnpg5vsGauD24Wlzf3fZiJ3VTyXCcC2s38iT 9YbvsDGcZRVe7YYUtV2Pkvka18X3Bb9qIWSsOEEfTpTF4dJ/94Gfi1ZzDk3F2bufGVDj uTag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UiKoYQI1; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 p73-v6si6415628pfl.57.2018.07.05.06.05.30; Thu, 05 Jul 2018 06:05:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-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=UiKoYQI1; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 S1754462AbeGENF1 (ORCPT + 4 others); Thu, 5 Jul 2018 09:05:27 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:50235 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754364AbeGENFY (ORCPT ); Thu, 5 Jul 2018 09:05:24 -0400 Received: by mail-wm0-f66.google.com with SMTP id v25-v6so11042374wmc.0 for ; Thu, 05 Jul 2018 06:05:24 -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=m7EbUSCixlczjT8GRHqc9JZ/Q677zWmKsckfCGoGQ9s=; b=UiKoYQI1QtgF0V0kAasHM99HSqOqngH7Nzf/1EvOZfaESKoiVVO2BJmaT5UN5AdQym afCNwYoGoK+o3aDLoIQrzDNJzDozI7vp0MrZdGrn3HwGwKEQj2cCrFPL3vgpmU45H833 +ybF8XcA9/Vsjoy8g8me65S+0Xn0Yl3xDFmyc= 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=m7EbUSCixlczjT8GRHqc9JZ/Q677zWmKsckfCGoGQ9s=; b=mCPzbf4mDYiNuknS32JdW2tarWxumLVzb8q8IwvsKTWpcTg71jLAbHTW219t7vDzAm qBYob8+wTpESLqC6DYrADdrgqNyfDhbF/4XLcCdKTt3WVGyVtN2zDWOaoQSNhXfH2sS7 5LIMeUn5CygFVu7sQabLNyeLUcoZI2eEQucZRr8iTZ2bIPtEVwe8R09DkUK6lj5Ok809 egqUgtmMBOUlW8+48AaA1jvWdjvGNTsOSj3IkDDBX9TOPw7RwVpt8oKxxyHoOFoPNXuB xZcyVMQ5XrdTaPNYH1q4iIS5T1ESGii2Htc/a8WGXgUWsDDZW2ggPGih7tZIv587BGv4 d0Rg== X-Gm-Message-State: APt69E3NxmiZuuzrzCg6z1sd45a92KMu9jZ4LCrLV0SZDLTc2XX9ZUZZ pAklnEPG094R8LR+vFQV8jOKvA== X-Received: by 2002:adf:9485:: with SMTP id 5-v6mr4848877wrr.82.1530795923393; Thu, 05 Jul 2018 06:05:23 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id 11-v6sm2109102wrw.67.2018.07.05.06.05.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 06:05:22 -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 , Alexandre Courbot , Stanimir Varbanov Subject: [PATCH v5 15/27] venus: helpers: add helper function to set actual buffer size Date: Thu, 5 Jul 2018 16:03:49 +0300 Message-Id: <20180705130401.24315-16-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180705130401.24315-1-stanimir.varbanov@linaro.org> References: <20180705130401.24315-1-stanimir.varbanov@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add and use a helper function to set actual buffer size for particular buffer type. This is also preparation to use the second decoder output. Signed-off-by: Stanimir Varbanov Reviewed-by: Tomasz Figa --- drivers/media/platform/qcom/venus/helpers.c | 12 ++++++++++++ drivers/media/platform/qcom/venus/helpers.h | 1 + drivers/media/platform/qcom/venus/vdec.c | 10 ++-------- 3 files changed, 15 insertions(+), 8 deletions(-) -- 2.14.1 diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c index 29cc84777125..6fd7458f390a 100644 --- a/drivers/media/platform/qcom/venus/helpers.c +++ b/drivers/media/platform/qcom/venus/helpers.c @@ -546,6 +546,18 @@ int venus_helper_set_dyn_bufmode(struct venus_inst *inst) } EXPORT_SYMBOL_GPL(venus_helper_set_dyn_bufmode); +int venus_helper_set_bufsize(struct venus_inst *inst, u32 bufsize, u32 buftype) +{ + const u32 ptype = HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL; + struct hfi_buffer_size_actual bufsz; + + bufsz.type = buftype; + bufsz.size = bufsize; + + return hfi_session_set_property(inst, ptype, &bufsz); +} +EXPORT_SYMBOL_GPL(venus_helper_set_bufsize); + 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 52b961ed491e..cd306bd8978f 100644 --- a/drivers/media/platform/qcom/venus/helpers.h +++ b/drivers/media/platform/qcom/venus/helpers.h @@ -41,6 +41,7 @@ int venus_helper_set_num_bufs(struct venus_inst *inst, unsigned int input_bufs, unsigned int output_bufs); 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); 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); diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index c37779d82fec..d2a53c0eab86 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -710,7 +710,6 @@ static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) { struct venus_inst *inst = vb2_get_drv_priv(q); struct venus_core *core = inst->core; - u32 ptype; int ret; mutex_lock(&inst->lock); @@ -740,13 +739,8 @@ static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) goto deinit_sess; if (core->res->hfi_version == HFI_VERSION_3XX) { - struct hfi_buffer_size_actual buf_sz; - - ptype = HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL; - buf_sz.type = HFI_BUFFER_OUTPUT; - buf_sz.size = inst->output_buf_size; - - ret = hfi_session_set_property(inst, ptype, &buf_sz); + ret = venus_helper_set_bufsize(inst, inst->output_buf_size, + HFI_BUFFER_OUTPUT); if (ret) goto deinit_sess; }