From patchwork Fri Oct 23 12:57:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 284937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32FEEC4363A for ; Fri, 23 Oct 2020 12:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4DEF20E65 for ; Fri, 23 Oct 2020 12:57:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="C1s2PoR5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S464152AbgJWM5a (ORCPT ); Fri, 23 Oct 2020 08:57:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S464143AbgJWM5Z (ORCPT ); Fri, 23 Oct 2020 08:57:25 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D0BBC0613D7 for ; Fri, 23 Oct 2020 05:57:25 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id s9so1695065wro.8 for ; Fri, 23 Oct 2020 05:57:25 -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=+xri++KZd0ajH9qdVfAp67Rdv968jiyDThdwgMpFlQU=; b=C1s2PoR5O3lgcFe585reoiQJvXOXD6IBX9C7RDoyIHQqE+G2XDhpnGVoatJW551ssX FALN9Y7qmuik7OlOkaOrSpRKNMQJ5wts0JBvoOCg7OU2PYFka4ecQDFeZl3FaQ5KJn8E p85w7vrEMAnsJVngcaweMZYCJ2sB8UbLc85G3z226198JwO/rQ6UAk7Y4c+5qnvrKZy8 rB8Rq8XOZ7Vf41a6mVgnyADdcnTpli6x/8BgO0rFBjJQFkMea68RknoIM0Dye1oISd86 SmtYjnqEwg2qPhvjevKr9Gwu/kMjbW9By4O3XXPCXZkx7FmJ5iSU9aBuSFXYHkvEruJ4 hmMA== 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=+xri++KZd0ajH9qdVfAp67Rdv968jiyDThdwgMpFlQU=; b=gnVzLjK5v9WO2zarXG0kBj6WWkqSGH3zsXcPQS5/2Wa2QREbkiMfuPAX+7nkjgzEgv +ABpIFRjg96CSjOm9S3SrvxjTxkY7Wh7x5HvUnKkfpzUPJBN75RC/DbZEo3aHXkAI4t7 fRrnJGUbfpBmqzLa42+BH78RTVk/IkQJciVeKkK3gUiFCEgV3XT1WpTY+bdiVMhs6bF/ B4F0FU57q/PZfXcA8xzaLVMJpgWzRnsfrVvIw+dGn97L4HbxD60+RJetpVrd7g7/FCMn 2oOLg9Gkz7LQmiM0rCPWI1dlEs63SNOfTpjAs3vEisCdNKQbnLtjRylxYRXSLHItzLjk L+8Q== X-Gm-Message-State: AOAM531aPwGsHOA+13CosTJbOi3paD/FmpSH4H6Uxpd1e+VGG0exSgen Q+Md4BSinmouY64swalezZ0F5w== X-Google-Smtp-Source: ABdhPJwNk4Ej8+YvZTaW3P3YHgDEX1teggYAa0I8cBEU+Xl67inPYEEqk39KnkHG1tYLjpq1oK0kXQ== X-Received: by 2002:adf:eccb:: with SMTP id s11mr2529446wro.135.1603457843988; Fri, 23 Oct 2020 05:57:23 -0700 (PDT) Received: from localhost.localdomain (hst-221-77.medicom.bg. [84.238.221.77]) by smtp.gmail.com with ESMTPSA id s19sm3475873wmc.0.2020.10.23.05.57.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 05:57:23 -0700 (PDT) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vikash Garodia , Alexandre Courbot , Tomasz Figa , Dikshita Agarwal , Stanimir Varbanov Subject: [PATCH 4/4] venus: helpers: Delete unused stop streaming helper Date: Fri, 23 Oct 2020 15:57:04 +0300 Message-Id: <20201023125704.4984-5-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201023125704.4984-1-stanimir.varbanov@linaro.org> References: <20201023125704.4984-1-stanimir.varbanov@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org After re-design of encoder driver this helper is not needed anymore. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/helpers.c | 43 --------------------- drivers/media/platform/qcom/venus/helpers.h | 1 - 2 files changed, 44 deletions(-) diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c index 8d0ca70d740d..1668cbaf3c72 100644 --- a/drivers/media/platform/qcom/venus/helpers.c +++ b/drivers/media/platform/qcom/venus/helpers.c @@ -1404,49 +1404,6 @@ void venus_helper_buffers_done(struct venus_inst *inst, unsigned int type, } EXPORT_SYMBOL_GPL(venus_helper_buffers_done); -void venus_helper_vb2_stop_streaming(struct vb2_queue *q) -{ - struct venus_inst *inst = vb2_get_drv_priv(q); - struct venus_core *core = inst->core; - int ret; - - mutex_lock(&inst->lock); - - if (inst->streamon_out & inst->streamon_cap) { - ret = hfi_session_stop(inst); - ret |= hfi_session_unload_res(inst); - ret |= venus_helper_unregister_bufs(inst); - ret |= venus_helper_intbufs_free(inst); - ret |= hfi_session_deinit(inst); - - if (inst->session_error || core->sys_error) - ret = -EIO; - - if (ret) - hfi_session_abort(inst); - - venus_helper_free_dpb_bufs(inst); - - venus_pm_load_scale(inst); - INIT_LIST_HEAD(&inst->registeredbufs); - } - - venus_helper_buffers_done(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - VB2_BUF_STATE_ERROR); - venus_helper_buffers_done(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, - VB2_BUF_STATE_ERROR); - - if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) - inst->streamon_out = 0; - else - inst->streamon_cap = 0; - - venus_pm_release_core(inst); - - mutex_unlock(&inst->lock); -} -EXPORT_SYMBOL_GPL(venus_helper_vb2_stop_streaming); - int venus_helper_process_initial_cap_bufs(struct venus_inst *inst) { struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx; diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h index dca4794c05d9..b8d6c5085d4f 100644 --- a/drivers/media/platform/qcom/venus/helpers.h +++ b/drivers/media/platform/qcom/venus/helpers.h @@ -20,7 +20,6 @@ int venus_helper_vb2_buf_init(struct vb2_buffer *vb); int venus_helper_vb2_buf_prepare(struct vb2_buffer *vb); void venus_helper_vb2_buf_queue(struct vb2_buffer *vb); void venus_helper_process_buf(struct vb2_buffer *vb); -void venus_helper_vb2_stop_streaming(struct vb2_queue *q); int venus_helper_vb2_start_streaming(struct venus_inst *inst); void venus_helper_m2m_device_run(void *priv); void venus_helper_m2m_job_abort(void *priv);